diff --git a/machines/pedro/hardware-configuration-zfs.nix b/machines/pedro/hardware-configuration-zfs.nix
index a9e4cee..585f841 100644
--- a/machines/pedro/hardware-configuration-zfs.nix
+++ b/machines/pedro/hardware-configuration-zfs.nix
@@ -32,71 +32,72 @@
   fileSystems."/nix" =
     { device = "rpool/nixos/nix";
       fsType = "zfs";
-      options = [ "zfsutil" ];
+      neededForBoot = true;
     };
 
   fileSystems."/etc" =
     { device = "rpool/nixos/etc";
       fsType = "zfs";
-      options = [ "zfsutil" ];
+      neededForBoot = true;
     };
 
   fileSystems."/var" =
     { device = "rpool/nixos/var";
       fsType = "zfs";
-      options = [ "zfsutil" ];
+      neededForBoot = true;
     };
 
   fileSystems."/var/lib" =
     { device = "rpool/nixos/var/lib";
       fsType = "zfs";
-      options = [ "zfsutil" ];
+      neededForBoot = true;
     };
 
   fileSystems."/var/log" =
     { device = "rpool/nixos/var/log";
       fsType = "zfs";
-      options = [ "zfsutil" ];
+      neededForBoot = true;
     };
 
   fileSystems."/var/spool" =
     { device = "rpool/nixos/var/spool";
       fsType = "zfs";
-      options = [ "zfsutil" ];
+      neededForBoot = true;
     };
 
-  fileSystems."/serverdata/pihole" =
-    { device = "rpool/serverdata/pihole";
-      fsType = "zfs";
-      options = [ "zfsutil" ];
-    };
+
   fileSystems."/serverdata/gitea" =
     { device = "rpool/serverdata/gitea";
       fsType = "zfs";
-      options = [ "zfsutil" ];
+      neededForBoot = true;
     };
   fileSystems."/serverdata/home-assistant" =
     { device = "rpool/serverdata/home-assistant";
       fsType = "zfs";
-      options = [ "zfsutil" ];
+      neededForBoot = true;
+    };
+  fileSystems."/serverdata/pihole" =
+    { device = "rpool/serverdata/pihole";
+      fsType = "zfs";
+      neededForBoot = true;
     };
 
   fileSystems."/home" =
     { device = "rpool/userdata/home";
       fsType = "zfs";
-      options = [ "zfsutil" ];
+      neededForBoot = true;
     };
 
   fileSystems."/root" =
     { device = "rpool/userdata/home/root";
       fsType = "zfs";
-      options = [ "zfsutil" ];
+      neededForBoot = true;
     };
 
   fileSystems."/home/jacob" =
     { device = "rpool/userdata/home/jacob";
       fsType = "zfs";
-      options = [ "zfsutil" ];
+      neededForBoot = true;
     };
 
   swapDevices = [