diff --git a/modules/remote-builds.nix b/modules/remote-builds.nix
index 6ebb2ea..116dfa4 100644
--- a/modules/remote-builds.nix
+++ b/modules/remote-builds.nix
@@ -1,19 +1,38 @@
 {
    config,
    outputs,
+   lib,
   ...
 }:
 {
-  nix.distributedBuilds = true;
-  # nix.settings.builders-use-substitutes = true;
-  nix.buildMachines = [
-   {
-    hostName = "ymir";
-     systems = ["x86_64-linux" "aarch64-linux"];
-     supportedFeatures = outputs.nixosConfigurations.ymir.config.nix.settings.system-features;
-     sshKey = config.age.secrets.ssh-key-private.path;
-     sshUser = "osbm";
-     protocol = "ssh-ng";
-   }
+  config = lib.mkMerge [
+    (lib.mkIf (config.networking.hostName != "ymir") {
+      nix.distributedBuilds = true;
+      # nix.settings.builders-use-substitutes = true;
+      nix.buildMachines = [
+        {
+          hostName = "ymir";
+          systems = ["x86_64-linux" "aarch64-linux"];
+          supportedFeatures = outputs.nixosConfigurations.ymir.config.nix.settings.system-features;
+          sshKey = config.age.secrets.ssh-key-private.path;
+          sshUser = "osbm";
+          protocol = "ssh-ng";
+        }
+      ];
+    })
+    (lib.mkIf (config.networking.hostName != "wallfacer") {
+      nix.distributedBuilds = true;
+      # nix.settings.builders-use-substitutes = true;
+      nix.buildMachines = [
+        {
+          hostName = "wallfacer";
+          systems = ["x86_64-linux"];
+          supportedFeatures = outputs.nixosConfigurations.wallfacer.config.nix.settings.system-features;
+          sshKey = config.age.secrets.ssh-key-private.path;
+          sshUser = "osbm";
+          protocol = "ssh-ng";
+        }
+      ];
+    })
   ];
 }