diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index e5356acbb5..b84d25dfdb 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -28,6 +28,7 @@ Changes / Improvements / Optimisations:
 Bug Fixes:
 - General | Removed an obsolete OpenMediaVault cron job and binary that was leftover on at least one of our images (NanoPi NEO2) and is not part of the current OMV packages, thus save to remove in every case. Many thanks to @kt1024 for reporting this issue: https://github.com/MichaIng/DietPi/issues/2994
 - General | Resolved an issue where install of required APT packages for certain scripts could fail in the rare case that APT lists are outdated and old packages are not available in the repo anymore. Many thanks to @Paulisper for reporting this issue: https://github.com/MichaIng/DietPi/issues/2996
+- General | Resolved an issue on some Buster systems where console-setup fails on boot to apply keyboard layout and console settings. Many thanks to @jaxjexjox for reporting this issue: https://github.com/MichaIng/DietPi/issues/2912#issuecomment-532100542
 - Rock64/RockPro64 | Resolved an issue where DietPi could not obtain the active network adapter and IP, if onboard Ethernet was used. This is because of a kernel-related bug, which seems to cause Ethernet connection instabilities as well in cases. A workaround is applied to all new Rock(Pro)64 images and via DietPi-Update. Many thanks to @svh1985 for reporting this issue, as well as searching and testing the workaround: https://github.com/MichaIng/DietPi/issues/3066
 - DietPi-Login | Resolved an issue during first run setup, where DietPi-Software was called with mostly wrong whiptail menu dimensions. This lead to info prompts and menus being quite small, in particular the "Install" menu entry, that one needs to select, being only visible when navigating to the bottom. Many thanks to @pbecks1963 for reporting this issue: https://github.com/MichaIng/DietPi/issues/3053
 - DietPi-NordVPN | Resolved an issue where the server menu could have wrong entries or even fail, if foreign files were placed inside the config directory. Many thanks to @svh1985 for reporting this issue and implementing a fix: https://github.com/MichaIng/DietPi/pull/3047
diff --git a/dietpi/dietpi-config b/dietpi/dietpi-config
index 5be9676ef0..8854afab2f 100644
--- a/dietpi/dietpi-config
+++ b/dietpi/dietpi-config
@@ -2056,7 +2056,7 @@ Current setting: $user_frequency_min_text" && G_CONFIG_INJECT 'CONFIG_CPU_MIN_FR
 
 			'Locale' ": [$locale_current]"
 			'Timezone' ": [$(</etc/timezone)]"
-			'Keyboard' ": [$(grep 'XKBLAYOUT=' /etc/default/keyboard | sed 's/^[^=]*=//' | sed 's/"//g')]"
+			'Keyboard' ": [$(sed -n '/^[[:blank:]]*XKBLAYOUT=/{s/^[^=]*=//;s/"//gp;q}' /etc/default/keyboard)]"
 
 		)
 
@@ -2068,8 +2068,6 @@ Current setting: $user_frequency_min_text" && G_CONFIG_INJECT 'CONFIG_CPU_MIN_FR
 
 				'Locale')
 
-					REBOOT_REQUIRED=1
-
 					G_FILE_EXISTS /usr/share/i18n/SUPPORTED
 
 					G_WHIP_MENU_ARRAY=()
@@ -2089,6 +2087,7 @@ Current setting: $user_frequency_min_text" && G_CONFIG_INJECT 'CONFIG_CPU_MIN_FR
 					if G_WHIP_MENU 'Please select a system locale. DietPi will automatically apply this as the default locale:'; then
 
 						/DietPi/dietpi/func/dietpi-set_software locale "$G_WHIP_RETURNED_VALUE"
+						REBOOT_REQUIRED=1
 
 					fi
 
@@ -2096,20 +2095,17 @@ Current setting: $user_frequency_min_text" && G_CONFIG_INJECT 'CONFIG_CPU_MIN_FR
 
 				'Timezone')
 
-					REBOOT_REQUIRED=1
 					dpkg-reconfigure tzdata
 
 				;;
 
 				'Keyboard')
 
-					REBOOT_REQUIRED=1
-
 					G_WHIP_MSG 'NB: A keyboard must be physically plugged into the system, before its configuration can be changed.\n\nIf a keyboard is plugged in, please ignore this message. If not, plug one in ;)'
 					dpkg-reconfigure keyboard-configuration
-					invoke-rc.d keyboard-setup start
+					setupcon --save
 
-			   ;;
+				;;
 
 			esac
 
diff --git a/dietpi/patch_file b/dietpi/patch_file
index a4c8e1c8a1..f41aaca2be 100644
--- a/dietpi/patch_file
+++ b/dietpi/patch_file
@@ -2178,6 +2178,9 @@ fdt set /ethernet@$identifier snps,txpbl <0x21>/;q}" /boot/boot.cmd
 
 			fi
 			#-------------------------------------------------------------------------------
+			# Run "setupcon --save" to force font and cached console+keyboard script renewal. This solves an issue on Buster, where the "console-setup" service fails to do this on boot in cases: https://github.com/MichaIng/DietPi/issues/2912#issuecomment-532100542
+			setupcon --save
+			#-------------------------------------------------------------------------------
 			# Reinstalls and software install changes
 			if (( $G_DIETPI_INSTALL_STAGE == 2 )); then
 
diff --git a/rootfs/var/lib/dietpi/services/dietpi-firstboot.bash b/rootfs/var/lib/dietpi/services/dietpi-firstboot.bash
index 63d1526d3f..23a4e310ff 100755
--- a/rootfs/var/lib/dietpi/services/dietpi-firstboot.bash
+++ b/rootfs/var/lib/dietpi/services/dietpi-firstboot.bash
@@ -153,7 +153,7 @@
 
 			G_DIETPI-NOTIFY 2 "Setting Keyboard $autoinstall_keyboard. Please wait..."
 			G_CONFIG_INJECT 'XKBLAYOUT=' "XKBLAYOUT=\"$autoinstall_keyboard\"" /etc/default/keyboard
-			#systemctl restart keyboard-setup
+			setupcon --save
 
 		fi