diff --git a/setup/archbaseos-guided-install.sh b/setup/archbaseos-guided-install.sh
index 5974a1d..1faa01b 100755
--- a/setup/archbaseos-guided-install.sh
+++ b/setup/archbaseos-guided-install.sh
@@ -125,8 +125,10 @@ if $AF_MODE; then
     ENABLE_FIDO_ROOT=$(af_bool '.fido2_root')
     ENABLE_FIDO_USER=$(af_bool '.fido2_user')
     RUN_TUI=$(af_bool '.run_tui')
+    KEYMAP=$(af_get '.keymap' 'us')
     echo "Kernel:   $KERNEL / Hostname: $HOSTNAME / Username: $USERNAME"
     echo "Encrypt:  $ENCRYPT_DISK / FIDO2 root: $ENABLE_FIDO_ROOT / FIDO2 user: $ENABLE_FIDO_USER"
+    echo "Keymap:   $KEYMAP"
 else
     KERNEL=$(ask "Kernel (linux, linux-lts, linux-zen)")
     HOSTNAME=$(ask "Hostname")
@@ -137,6 +139,16 @@ else
         read -rp "Enable FIDO2 for unlocking root? (YES/NO): " ENABLE_FIDO_ROOT
     fi
     read -rp "Enable FIDO2 for user login? (YES/NO): " ENABLE_FIDO_USER
+
+    echo ""
+    echo "Select keyboard layout:"
+    echo "  1) English US  (us)"
+    echo "  2) German      (de)"
+    read -rp "Choice [1]: " _KM_CHOICE
+    case "${_KM_CHOICE:-1}" in
+        2) KEYMAP="de" ;;
+        *) KEYMAP="us" ;;
+    esac
 fi
 
 read -rsp "Password for $USERNAME: " USERPASS; echo
@@ -240,6 +252,7 @@ arch-chroot /mnt /usr/bin/env \
   ENABLE_FIDO_USER="$ENABLE_FIDO_USER" \
   ROOT_UUID="$ROOT_UUID" \
   ROOT_PART="$ROOT_PART" \
+  KEYMAP="$KEYMAP" \
   /bin/bash <<'CHROOT_EOF'
 
 set -euo pipefail
@@ -248,6 +261,8 @@ echo "en_US.UTF-8 UTF-8" > /etc/locale.gen
 locale-gen
 echo "LANG=en_US.UTF-8" > /etc/locale.conf
 
+echo "KEYMAP=${KEYMAP}" > /etc/vconsole.conf
+
 ln -sf /usr/share/zoneinfo/Europe/Vienna /etc/localtime
 hwclock --systohc