diff --git a/guix-strap/guix-crypt b/guix-strap/guix-crypt
index f2afbbd..f6d00f5 100755
--- a/guix-strap/guix-crypt
+++ b/guix-strap/guix-crypt
@@ -61,6 +61,10 @@ EVENT "Setting up EFI vfat"
 
 mkfs.vfat "-F32" "$EFI_PARTITION"
 
+EVENT "Mounting EFI"
+
+mount $EFI_PARTITION /mnt/boot/efi
+
 EVENT "Successfully setup efi vfat and luks"
 
 echo "CRYPT_PARTITION=\"$CRYPT_PARTITION\"" >> ./guix-env
diff --git a/guix-strap/guix-setup b/guix-strap/guix-setup
index 7fb027b..5ee8060 100755
--- a/guix-strap/guix-setup
+++ b/guix-strap/guix-setup
@@ -32,12 +32,20 @@ EOF
     read -r  ANSWER
 }
 
+cleanup() {
+    herd stop cow-store
+    umount /mnt/boot/efi
+    umount /mnt
+    umount /tmp
+    cryptsetup close cryptroot
+}
+
 welcome
 ./guix-partition
 ./guix-crypt
 ./guix-configure
 ./guix-install
-./guix-password
+cleanup
 
 echo "GNU Guix has been installed, you can now reboot..."
 exit 0