diff --git a/os/builder.nix b/os/builder.nix
index fc9c132..5fea133 100644
--- a/os/builder.nix
+++ b/os/builder.nix
@@ -17,9 +17,13 @@ in
   users.groups.remotebuild = {};
 
   nix.settings.extra-trusted-users = [ "remotebuild" ];
-  nix.settings.extra-system-features = [
+  nix.settings.system-features = [
+    "benchmark"
+    "big-parallel"
+    "ca-derivations"
+    "kvm"
+    "nixos-test"
     "gccarch-x86-64-v2"
     "gccarch-x86-64-v3"
-    "gccarch-znver2"
   ];
 }
diff --git a/os/hs/configuration.nix b/os/hs/configuration.nix
index 2d718e2..bdd1ca6 100644
--- a/os/hs/configuration.nix
+++ b/os/hs/configuration.nix
@@ -157,6 +157,4 @@ in {
       supportedFeatures = [ "nixos-test" "big-parallel" "kvm" "gccarch-x86-64-v3" ];
     }
   ];
-
-  nix.settings.store-auto-optimise = true;
 }