diff --git a/.gitignore b/.gitignore
index bb24878a..a2fa571c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ result
 *.qcow2
 .direnv/
 book/
+fanny-efi-vars.fd
diff --git a/machines/modules/disko/fanny.nix b/machines/modules/disko/fanny.nix
index 53380c65..9366fe6c 100644
--- a/machines/modules/disko/fanny.nix
+++ b/machines/modules/disko/fanny.nix
@@ -17,6 +17,13 @@
                 mountOptions = [ "umask=0077" ];
               };
             };
+            encryptedSwap = {
+              size = "8G"; #set to 100M for testing
+              content =  {
+                type = "swap";
+                randomEncryption = true;
+              };
+            };
             zfs = {
               size = "100%";
               content = {
@@ -70,6 +77,7 @@
         # Workaround: cannot import 'zroot': I/O error in disko tests
         options.cachefile = "none";
         rootFsOptions = {
+          mountpoint = "none";
           compression = "zstd";
           "com.sun:auto-snapshot" = "false";
         };
@@ -114,6 +122,7 @@
       storage = {
         type = "zpool";
         mode = "mirror";
+        rootFsOptions = { mountpoint = "none"; };
 
         datasets = {
           encrypted = {