diff --git a/setup/arch-auto-install-new-cgpt.sh b/setup/arch-auto-install-new-cgpt.sh
index 17de169..b5f6a68 100755
--- a/setup/arch-auto-install-new-cgpt.sh
+++ b/setup/arch-auto-install-new-cgpt.sh
@@ -49,13 +49,15 @@ echo "Encrypting root partition with LUKS..."
 cryptsetup luksFormat "$ROOT_PART" --type luks2
 cryptsetup open "$ROOT_PART" cryptroot
 
+
 # Add multiple FIDO2 keys for LUKS
 if [[ "$FIDO_ROOT" == "yes" ]]; then
-    read -rp "How many FIDO2 keys for LUKS unlocking? " FIDO_LUKS_COUNT
-    for ((i=1; i<=FIDO_LUKS_COUNT; i++)); do
-        echo "Insert FIDO2 key #$i and touch it when prompted..."
-        cryptsetup luksAddKey "$ROOT_PART" --fido2-device=auto
-    done
+    systemd-cryptenroll "$ROOT_PART" --fido2-device=auto
+#    read -rp "How many FIDO2 keys for LUKS unlocking? " FIDO_LUKS_COUNT
+#    for ((i=1; i<=FIDO_LUKS_COUNT; i++)); do
+#        echo "Insert FIDO2 key #$i and touch it when prompted..."
+#        syste "$ROOT_PART" --fido2-device=auto
+#    done
 fi
 
 # Format encrypted root as Btrfs and create subvolumes