diff --git a/hosts/kalessin/default.nix b/hosts/kalessin/default.nix
index 77992e5..ef0157e 100644
--- a/hosts/kalessin/default.nix
+++ b/hosts/kalessin/default.nix
@@ -22,12 +22,10 @@ in
   qenya.services.remote-builder = {
     enable = true;
     authorizedKeys.keys = [
+      keys.machines.kilgharrah
       keys.machines.tohru
-      keys.machines.yevaud
-      keys.machines.orm
     ];
   };
-  boot.binfmt.emulatedSystems = [ "x86_64-linux" ];
 
   system.stateVersion = "23.11";
 }
diff --git a/hosts/kilgharrah/default.nix b/hosts/kilgharrah/default.nix
index f656149..4ac9a04 100644
--- a/hosts/kilgharrah/default.nix
+++ b/hosts/kilgharrah/default.nix
@@ -40,11 +40,12 @@ in
 
   qenya.services.remote-builder = {
     enable = true;
-    authorizedKeys.keys = [
-      keys.machines.tohru
-      keys.machines.yevaud
-      keys.machines.orm
-    ];
+    authorizedKeys.keys = [ keys.machines.tohru ];
+  };
+  qenya.services.distributed-builds = {
+    enable = true;
+    keyFile = "/etc/ssh/ssh_host_ed25519_key";
+    builders = [ "kalessin" ];
   };
 
   programs.steam.enable = true;
diff --git a/hosts/orm/default.nix b/hosts/orm/default.nix
index 6af5de3..1d8a648 100644
--- a/hosts/orm/default.nix
+++ b/hosts/orm/default.nix
@@ -14,12 +14,6 @@
   users.users.qenya.extraGroups = [ "wheel" ];
   qenya.base-server.enable = true;
 
-  qenya.services.distributed-builds = {
-    enable = true;
-    keyFile = "/etc/ssh/ssh_host_ed25519_key";
-    builders = [ "kalessin" ];
-  };
-
   randomcat.services.zfs.datasets = {
     "rpool_orm/state" = { mountpoint = "none"; };
     "rpool_orm/state/actual" = { mountpoint = "/var/lib/actual"; };
diff --git a/hosts/tohru/default.nix b/hosts/tohru/default.nix
index cae91d3..9d5702c 100644
--- a/hosts/tohru/default.nix
+++ b/hosts/tohru/default.nix
@@ -49,7 +49,7 @@
   qenya.services.distributed-builds = {
     enable = true;
     keyFile = "/etc/ssh/ssh_host_ed25519_key";
-    builders = [ "kalessin" ];
+    builders = [ "kilgharrah" "kalessin" ];
   };
 
   programs.evolution.enable = true; # not in home-manager yet; not declaratively configurable yet
diff --git a/hosts/yevaud/default.nix b/hosts/yevaud/default.nix
index aa0a671..2a8fdae 100644
--- a/hosts/yevaud/default.nix
+++ b/hosts/yevaud/default.nix
@@ -14,12 +14,6 @@
   users.users.qenya.extraGroups = [ "wheel" ];
   qenya.base-server.enable = true;
 
-  qenya.services.distributed-builds = {
-    enable = true;
-    keyFile = "/etc/ssh/ssh_host_ed25519_key";
-    builders = [ "kalessin" ];
-  };
-
   services.bind = {
     # enable = true;
     cacheNetworks = [ "10.127.0.0/16" "fd70:81ca:0f8f::/48" ];
diff --git a/services/distributed-builds.nix b/services/distributed-builds.nix
index e0bbbbb..09cdd44 100644
--- a/services/distributed-builds.nix
+++ b/services/distributed-builds.nix
@@ -38,8 +38,17 @@ in
         hostName = config.birdsong.hosts."kalessin".ipv4;
         sshUser = "remotebuild";
         sshKey = cfg.keyFile;
-        systems = [ "aarch64-linux" "x86_64-linux" ];
-        supportedFeatures = [ ];
+        systems = [ "aarch64-linux" ];
+        maxJobs = 2;
+        supportedFeatures = [ "big-parallel" ];
+      })
+      ++ (optional (elem "kilgharrah" cfg.builders) {
+        hostName = config.birdsong.hosts."kilgharrah".ipv4;
+        sshUser = "remotebuild";
+        sshKey = cfg.keyFile;
+        systems = [ "x86_64-linux" ];
+        maxJobs = 12;
+        supportedFeatures = [ "big-parallel" ];
       });
   };
 }