diff --git a/helpers/DATA/finish-install/fix_keyboard-configure-netinstall.patch b/helpers/DATA/finish-install/fix_keyboard-configure-netinstall.patch
new file mode 100644
index 0000000000000000000000000000000000000000..231ab514459bc92877f44ddb497b99ad1a7f444d
--- /dev/null
+++ b/helpers/DATA/finish-install/fix_keyboard-configure-netinstall.patch
@@ -0,0 +1,16 @@
+diff -Nru finish-install-2.104+11.0trisquel0/finish-install.d/10update-initramfs finish-install-2.104+11.0trisquel0/finish-install.d/10update-initramfs
+--- finish-install-2.104+11.0trisquel0/finish-install.d/10update-initramfs	2018-08-10 14:21:58.000000000 -0500
++++ finish-install-2.104+11.0trisquel0/finish-install.d/10update-initramfs	2022-12-18 17:56:21.817264252 -0600
+@@ -4,7 +4,11 @@
+ # update-initramfs to make sure one can type the passphrase
+ # (see #694156, workaround for #696773):
+ /bin/in-target \
+-    /bin/sh -c "dpkg-query -s cryptsetup >/dev/null 2>&1 && dpkg-query -s console-setup >/dev/null 2>&1"
++    /bin/sh -c "dpkg-query -s console-setup >/dev/null 2>&1"
++
++#Fix bug keyboard not using the selected layout.
++/bin/in-target \
++    dpkg-reconfigure -f noninteractive keyboard-configuration
+ 
+ if [ $? = 0 ]; then
+     echo "Encrypted LVM detected, refreshing initramfs"
diff --git a/helpers/make-finish-install b/helpers/make-finish-install
index b544de051226659ecf8df57cb057f666a1836eee..01d6d9da77d3169776fad3e6023782ecd6008a6b 100644
--- a/helpers/make-finish-install
+++ b/helpers/make-finish-install
@@ -23,12 +23,13 @@
 # such packages from Debian in order to build the required udeb packages.
 ##
 
-VERSION=0
+VERSION=1
 EXTERNAL='deb-src http://ftp.debian.org/debian stable main'
 REPOKEY=648ACFD622F3D138
 NETINST=true
 . ./config
 
+patch -p1 < $DATA/fix_keyboard-configure-netinstall.patch
 
 changelog "Fetch and build as udeb dependency for debian-installer."
 compile