diff --git a/pikainstall/debian/changelog b/pikainstall/debian/changelog
index 471360a..0358357 100644
--- a/pikainstall/debian/changelog
+++ b/pikainstall/debian/changelog
@@ -1,4 +1,4 @@
-pikainstall (2.0.0-101pika2) pika; urgency=medium
+pikainstall (2.0.0-101pika3) pika; urgency=medium
 
   * Adapt to new installer
 
diff --git a/pikainstall/usr/lib/pika/pikainstall/pikainstall b/pikainstall/usr/lib/pika/pikainstall/pikainstall
index 49f7016..5aed07a 100755
--- a/pikainstall/usr/lib/pika/pikainstall/pikainstall
+++ b/pikainstall/usr/lib/pika/pikainstall/pikainstall
@@ -298,7 +298,8 @@ else:
     with open(CHROOT_LANG_FILE_PATH, "w") as file:
         lang_crypttab_file = _LANG_SETUP_FILE.format(
             LOCALE=listToString(args.locale),
-            KEYBOARD=listToString(args.keyboard),
+            XKBLAYOUT=listToString(args.klayout),
+            KEYMAP=listToString(args.keymap),
             TIMEZONE=listToString(args.timezone),
             KVARIANT="",
         )