diff --git a/machines/nix-book/configuration.nix b/machines/nix-book/configuration.nix
index ccf7cd8..4e46ff7 100644
--- a/machines/nix-book/configuration.nix
+++ b/machines/nix-book/configuration.nix
@@ -23,12 +23,12 @@
     printing.enable = true;
     remote-build.builders = [
       {
-        hostName = "zix790prors";
+        hostName = "zix790prors.oglehome";
         maxJobs = 16;
         speedFactor = 3;
       }
       {
-        hostName = "john-endesktop";
+        hostName = "john-endesktop.oglehome";
         maxJobs = 1;
         speedFactor = 1;
       }
diff --git a/machines/nix-deck/configuration.nix b/machines/nix-deck/configuration.nix
index 011cf27..238e10f 100644
--- a/machines/nix-deck/configuration.nix
+++ b/machines/nix-deck/configuration.nix
@@ -19,11 +19,18 @@
         desktopSession = "plasma";
       };
     };
-    remote-build.builders = [{
-      hostName = "zix790prors";
-      maxJobs = 16;
-      speedFactor = 4;  # Prefer remote heavily on Steam Deck
-    }];
+    remote-build.builders = [
+      {
+        hostName = "zix790prors.oglehome";
+        maxJobs = 16;
+        speedFactor = 4;
+      }
+      {
+        hostName = "john-endesktop.oglehome";
+        maxJobs = 1;
+        speedFactor = 2;
+      }
+    ];
     users = {
       enable = true;
       extraGroups = [ "video" ];
diff --git a/roles/remote-build/default.nix b/roles/remote-build/default.nix
index d18ebac..181869b 100644
--- a/roles/remote-build/default.nix
+++ b/roles/remote-build/default.nix
@@ -35,12 +35,12 @@
 #    a) Configure builders in configuration.nix:
 #       roles.remote-build.builders = [
 #         {
-#           hostName = "zix790prors";
+#           hostName = "zix790prors.oglehome";
 #           maxJobs = 16;      # Number of parallel build jobs
 #           speedFactor = 3;   # Higher = prefer this builder
 #         }
 #         {
-#           hostName = "john-endesktop";
+#           hostName = "john-endesktop.oglehome";
 #           maxJobs = 1;       # Conservative for busy machines
 #           speedFactor = 1;
 #         }