diff --git a/devices.nix b/devices.nix
index 0eaa3b0..7313e7b 100644
--- a/devices.nix
+++ b/devices.nix
@@ -28,6 +28,7 @@ in
     system = "aarch64-linux";
     distributedBuilds = {
       isBuilder = true;
+      speedFactor = 1;
       clientPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK0NLgg0sFobBWz/bjYs9WkrMvlcvJC5F6+3jQ/b+AnD forgejo-runner-1-nix-builds";
       hostPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIANGC89GiT5xCsFICwrharrbV3q7acWHqk6ZwOUXbtGT";
       storeSigningPublicKey = "forgejo-runner-1:ln1FVLL8G5+IveQuBi/Kn3SaqFZ1gaiQrE3yPlMhCMA=";
@@ -44,6 +45,7 @@ in
     };
     distributedBuilds = {
       isBuilder = true;
+      speedFactor = 2;
       hostPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHGKoZ68wwyVRmPB0SkvpJUyUMDWeFbC5Je9zukyEOh7";
       clientPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKAbojdhb3PfazSRmudvo381Y+zUFVLMa7AbWbfK/Zp2 muede-lpt2-nix-builds";
       storeSigningPublicKey = "muede-lpt2:3csut7FW6oZK/ztRLBRC80LSBfFE3qzl+aIYgOixB6U=";
@@ -57,7 +59,7 @@ in
     };
     distributedBuilds = {
       isBuilder = true;
-      speedFactor = 2;
+      speedFactor = 4;
       hostPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKEQQS5XNoj62Oj85xQfIuLORwoBRwfqjvfBHHsiI+RH";
       clientPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHmnyhP6L+kGHV15cb/d31AQr50wSEaQhkUBwy2+OEKk muede-pc2-nix-builds";
       storeSigningPublicKey = "muede-pc2:fqQO0E0y65MjUWlQnrgWt5ZsmQKlKCv4jls3CmUXDEQ=";
diff --git a/nixosModules/distributed-builds.nix b/nixosModules/distributed-builds.nix
index 91341f5..50d9ee6 100644
--- a/nixosModules/distributed-builds.nix
+++ b/nixosModules/distributed-builds.nix
@@ -104,7 +104,7 @@ in
           knownHosts = buildServerKnownHosts;
           extraConfig = lib.concatStringsSep "\n" (
             lib.mapAttrsToList (name: _: ''
-              Match host ${name} user ${buildUser}
+              Match originalhost ${name} user ${buildUser}
                 IdentityFile ${clientSshKeyPath}
                 IdentitiesOnly yes
             '') buildServerDevices