diff --git a/hosts/doloro/nixos.nix b/hosts/doloro/nixos.nix
index dc9500e..6ade029 100644
--- a/hosts/doloro/nixos.nix
+++ b/hosts/doloro/nixos.nix
@@ -231,14 +231,6 @@ in
       # enable = true;
       startAgent = true;
 
-      matchBlocks = {
-        "*" = {
-          addKeysToAgent = "yes";
-          identityFile = [
-            "~/.ssh/id_ed25519"
-          ];
-        };
-      };
     };
     fish.enable = true;
   };
diff --git a/modules/builder/nixos.nix b/modules/builder/nixos.nix
index 68f92ca..aef3f08 100644
--- a/modules/builder/nixos.nix
+++ b/modules/builder/nixos.nix
@@ -9,8 +9,9 @@ let
   remoteBuilder = lib.mkIf cfg.become-remote-builder {
     users.users.remotebuild = {
       isSystemUser = true;
+      shell = pkgs.bashInteractive;
       group = "remotebuild";
-      useDefaultShell = true;
+      # useDefaultShell = true;
 
       # ssh-keygen -f /root/.ssh/remotebuild
       openssh.authorizedKeys.keyFiles = [ ./remotebuild.pub ];
@@ -40,6 +41,8 @@ let
         sshUser = "remotebuild";
         sshKey = "/root/.ssh/remotebuild";
         system = "x86_64-linux";
+        maxJobs = 8;
+        speedFactor = 2;
         supportedFeatures = [
           "nixos-test"
           "big-parallel"