diff --git a/guix-strap/guix-crypt b/guix-strap/guix-crypt
index f9925f3..f2afbbd 100755
--- a/guix-strap/guix-crypt
+++ b/guix-strap/guix-crypt
@@ -39,7 +39,6 @@ get_password
 EVENT "Setting up luks"
 
 cryptsetup luksFormat --type luks1 "$CRYPT_PARTITION" <<EOF
-YES
 $PASSWORD
 $PASSWORD_CONFIRM
 EOF
@@ -50,6 +49,10 @@ cryptsetup open "$CRYPT_PARTITION" cryptroot <<EOF
 $PASSWORD
 EOF
 
+EVENT "Setting up cryptroot btrfs"
+
+mkfs.btrfs "/dev/mapper/cryptroot"
+
 EVENT "Mounting cryptroot"
 
 mount /dev/mapper/cryptroot /mnt