diff --git a/systems/nixbuild.nix b/systems/nixbuild.nix
index fd92e53..0b898af 100644
--- a/systems/nixbuild.nix
+++ b/systems/nixbuild.nix
@@ -10,6 +10,11 @@
       speedFactor = 3;
       sshUser = "harald";
       sshKey = "/etc/ssh/nix-builder-key";
+      supportedFeatures = [
+        "nixos-test"
+        "benchmark"
+        "big-parallel"
+      ];
     }
     {
       hostName = "rialo";
@@ -18,6 +23,11 @@
       speedFactor = 3;
       sshUser = "harald";
       sshKey = "/etc/ssh/nix-builder-key";
+      supportedFeatures = [
+        "nixos-test"
+        "benchmark"
+        "big-parallel"
+      ];
     }
     {
       hostName = "sgx";
@@ -26,9 +36,17 @@
       speedFactor = 1;
       sshUser = "harald";
       sshKey = "/etc/ssh/nix-builder-key";
+      supportedFeatures = [
+        "nixos-test"
+        "benchmark"
+        "big-parallel"
+        "kvm"
+      ];
     }
   ];
 
+  nix.settings.builders-use-substitutes = true;
+
   # Ensure Nix is in PATH for SSH sessions
   programs.fish.shellInit = ''
     set -gx PATH /nix/var/nix/profiles/default/bin $PATH