diff --git a/scripts/Arch/OS/setup.sh b/scripts/Arch/OS/setup.sh
index a435e4e8..b3508b7b 100755
--- a/scripts/Arch/OS/setup.sh
+++ b/scripts/Arch/OS/setup.sh
@@ -7,6 +7,7 @@ ARCH_HOSTNAME="${ARCH_HOSTNAME}";
 ARCH_MOUNT_ROOT="${ARCH_MOUNT_ROOT:-"/mnt"}";
 ARCH_LANG="${ARCH_LANG:-"en_US.UTF-8"}";
 ARCH_KEYMAP="${ARCH_KEYMAP:-"de_CH-latin1"}";
+ARCH_X11_KEYMAP="${ARCH_X11_KEYMAP:-"ch"}";
 LOCALE_PATTERN="${LOCALE_PATTERN:-"\(de_CH\|en_US\)"}";
 
 USER_NAME="${USER_NAME:-manuel}";
@@ -42,6 +43,7 @@ arch-chroot "$ARCH_MOUNT_ROOT" mkinitcpio -P;
 arch-chroot "$ARCH_MOUNT_ROOT" bash "$tempDir/../Software/GRUB/install.sh";
 arch-chroot "$ARCH_MOUNT_ROOT" bash "$tempDir/../Software/sudo/install.sh";
 arch-chroot "$ARCH_MOUNT_ROOT" bash "$tempDir/../Software/GNOME/install.sh";
+arch-chroot localectl set-x11-keymap "$ARCH_X11_KEYMAP";
 
 
 USER_NAME="${USER_NAME}" \