diff --git a/hosts/vulpes/core/hardware.nix b/hosts/vulpes/core/hardware.nix
index 896a747..919a55b 100644
--- a/hosts/vulpes/core/hardware.nix
+++ b/hosts/vulpes/core/hardware.nix
@@ -25,8 +25,22 @@
     };
   };
 
-  boot.zfs = {
-    forceImportAll = false;
-    forceImportRoot = false;
+  boot = {
+    supportedFilesystems = [
+      "zfs"
+    ];
+    zfs = {
+      extraPools = [ "sahara" ];
+      forceImportAll = false;
+      forceImportRoot = false;
+    };
+  };
+
+  services.zfs = {
+    trim.enable = true;
+    autoScrub = {
+      enable = true;
+      interval = "weekly";
+    };
   };
 }
diff --git a/hosts/vulpes/core/kernel.nix b/hosts/vulpes/core/kernel.nix
index 9a2f49f..ab069a4 100644
--- a/hosts/vulpes/core/kernel.nix
+++ b/hosts/vulpes/core/kernel.nix
@@ -42,10 +42,6 @@ in
     };
 
     kernelModules = [ "kvm-amd" ];
-    supportedFilesystems = [
-      "nfs"
-      "zfs"
-    ];
     kernelParams = [ "amdgpu.runpm=0" ];
     kernel.sysctl = {
       "net.ipv4.ip_forward" = 1;
diff --git a/hosts/vulpes/core/security.nix b/hosts/vulpes/core/security.nix
index 4fe2d2d..28e60ac 100644
--- a/hosts/vulpes/core/security.nix
+++ b/hosts/vulpes/core/security.nix
@@ -49,7 +49,9 @@
   # Setup run0 only with polkit and ssh agent forward
   security = {
     polkit.enable = true;
-    run0.enableSudoAlias = true;
+    run0 = {
+      enableSudoAlias = true;
+    };
     sudo.enable = false;
 
     pam = {
diff --git a/hosts/vulpes/infra/misc.nix b/hosts/vulpes/infra/misc.nix
index eaf7506..92b7f0f 100644
--- a/hosts/vulpes/infra/misc.nix
+++ b/hosts/vulpes/infra/misc.nix
@@ -100,11 +100,11 @@ in
       settings = {
         CORE_HOSTNAME = "127.0.0.1";
         CORE_PORT = 12712;
-        CORE_TRUST_PROXY = true;
-        CORE_RETURN_HTTPS_URLS = true;
-        
-        FEATURES_USER_REGISTRATION=false;
-        INVITES_ENABLED=true;
+        CORE_TRUST_PROXY = "true";
+        CORE_RETURN_HTTPS_URLS = "true";
+
+        FEATURES_USER_REGISTRATION = "false";
+        INVITES_ENABLED = "true";
 
         DATABASE_URL = "postgresql://zipline@localhost/zipline?host=/run/postgresql";
         DATASOURCE_TYPE = "s3";
diff --git a/modules/priv b/modules/priv
index d91c8be..fcdf547 160000
--- a/modules/priv
+++ b/modules/priv
@@ -1 +1 @@
-Subproject commit d91c8bed3262eab274b081fec3e5988e397ead44
+Subproject commit fcdf5478096447ccfa13ac9617ef36dafd036489