diff --git a/scripts_debian/02_install_groups.sh b/scripts_debian/02_install_groups.sh
index e261068..f8ef9c2 100755
--- a/scripts_debian/02_install_groups.sh
+++ b/scripts_debian/02_install_groups.sh
@@ -37,6 +37,17 @@ echo "--> Upgrading system"
 chroot $INSTALLDIR apt-get update
 chroot $INSTALLDIR apt-get -y upgrade
 
+echo "--> Setting keyboard layout"
+chroot $INSTALLDIR debconf-set-selections <<EOF
+keyboard-configuration  keyboard-configuration/variant  select  English (US)
+keyboard-configuration  keyboard-configuration/layout   select  English (US)
+keyboard-configuration  keyboard-configuration/model    select  Generic 105-key (Intl) PC
+keyboard-configuration  keyboard-configuration/modelcode    string  pc105
+keyboard-configuration  keyboard-configuration/layoutcode   string  us
+keyboard-configuration  keyboard-configuration/variantcode  string  
+keyboard-configuration  keyboard-configuration/optionscode  string  
+EOF
+
 echo "--> Installing extra packages"
 xargs chroot $INSTALLDIR apt-get -y install < $SCRIPTSDIR/packages.list
 
diff --git a/scripts_debian/04_install_qubes.sh b/scripts_debian/04_install_qubes.sh
index 449f4ce..8f05f57 100755
--- a/scripts_debian/04_install_qubes.sh
+++ b/scripts_debian/04_install_qubes.sh
@@ -63,17 +63,6 @@ deb file:/tmp/qubes_repo $DEBIANVERSION main
 EOF
 cp $CACHEDIR/repo-pubring.gpg $INSTALLDIR/etc/apt/trusted.gpg.d/qubes-builder.gpg
 
-# configure keyboard layout
-chroot $INSTALLDIR debconf-set-selections <<EOF
-keyboard-configuration  keyboard-configuration/variant  select  English (US)
-keyboard-configuration  keyboard-configuration/layout   select  English (US)
-keyboard-configuration  keyboard-configuration/model    select  Generic 105-key (Intl) PC
-keyboard-configuration  keyboard-configuration/modelcode    string  pc105
-keyboard-configuration  keyboard-configuration/layoutcode   string  us
-keyboard-configuration  keyboard-configuration/variantcode  string  
-keyboard-configuration  keyboard-configuration/optionscode  string  
-EOF
-
 chroot $INSTALLDIR apt-get update || { umount $INSTALLDIR/tmp/qubes_repo; exit 1; }
 chroot $INSTALLDIR apt-get -y install `cat $SCRIPTSDIR/packages_qubes.list` || { umount $INSTALLDIR/tmp/qubes_repo; exit 1; }
 umount $INSTALLDIR/tmp/qubes_repo