diff --git a/CoreModules/generic/generic.pkg.list b/CoreModules/generic/generic.pkg.list
index a5f1627..b472c47 100644
--- a/CoreModules/generic/generic.pkg.list
+++ b/CoreModules/generic/generic.pkg.list
@@ -1 +1 @@
-htop ufw nload fail2ban sudo
\ No newline at end of file
+htop ufw nload fail2ban sudo bash-completion
\ No newline at end of file
diff --git a/CoreModules/generic/preconf.sh b/CoreModules/generic/preconf.sh
index ee1a777..10d1add 100644
--- a/CoreModules/generic/preconf.sh
+++ b/CoreModules/generic/preconf.sh
@@ -30,6 +30,12 @@ timedatectl set-timezone Europe/Amsterdam > $OUTPUT 2>&1
 sed -i -e '/Port 22/c\Port 4242' -e 's/PermitRootLogin yes/PermitRootLogin prohibit-password/g' /etc/ssh/sshd_config > $OUTPUT 2>&1
 
 
+if [ "$osrel" = "ubu1804" ] || [ "$osrel" = "ubu2004" ] || [ "$osrel" = "deb10" ] ; then
+    sed -i -e '/XKBLAYOUT=/c\XKBLAYOUT=us' -e '/XKBVARIANT=/c\XKBVARIANT="intl"' /etc/default/keyboard > $OUTPUT 2>&1
+elif [ "$osrel" = "cent8" ]; then
+    localectl set-keymap us-int
+fi
+
 ##----------##
 #    Swap    #
 ##----------##