diff --git a/hosts/valefar/default.nix b/hosts/valefar/default.nix
index 4d2fd57..1089733 100644
--- a/hosts/valefar/default.nix
+++ b/hosts/valefar/default.nix
@@ -50,6 +50,35 @@
   boot.supportedFilesystems = [ "zfs" ];
   boot.kernelModules = [ "nct6775" "coretemp" ];
 
+  boot.zfs.extraPools = [ "garage" "storage" ];
+  boot.zfs.devNodes = "/dev/disk/by-id";
+  boot.zfs.forceImportAll = true;
+
+  systemd.services.zfs-import-cache.enable = false;
+  systemd.services.zfs-import-scan.enable = true;
+
+  systemd.services.zfs-import-scan = {
+    after = [ "systemd-udev-settle.service" ];
+    wants = [ "systemd-udev-settle.service" ];
+  };
+
+  systemd.mounts = [
+  {
+    what = "garage";
+    where = "/garage";
+    type = "zfs";
+    after = [ "zfs-import-scan.service" ];
+    wants = [ "zfs-import-scan.service" ];
+  }
+  {
+    what = "storage";
+    where = "/storage";
+    type = "zfs";
+    after = [ "zfs-import-scan.service" ];
+    wants = [ "zfs-import-scan.service" ];
+  }
+];
+
   services.zfs.autoScrub.enable = true;
   services.zfs.trim.enable = true;
 
diff --git a/hosts/valefar/hardware.nix b/hosts/valefar/hardware.nix
index 8b1780e..01b1115 100644
--- a/hosts/valefar/hardware.nix
+++ b/hosts/valefar/hardware.nix
@@ -24,7 +24,7 @@
       options = [ "fmask=0022" "dmask=0022" ];
     };
 
-  fileSystems."/garage" = {
+/*  fileSystems."/garage" = {
     device = "garage";
     fsType = "zfs";
   };
@@ -32,7 +32,7 @@
   fileSystems."/storage" = {
     device = "storage";
     fsType = "zfs";
-  };
+  };*/
 
   swapDevices = [ ];