diff --git a/clanServices/remote-builders/default.nix b/clanServices/remote-builders/default.nix
index 5d38b7e..0250a72 100644
--- a/clanServices/remote-builders/default.nix
+++ b/clanServices/remote-builders/default.nix
@@ -136,6 +136,7 @@
         mkMatch = name: _value: ''
           Match User remotebuild Host ${name}
             IdentityFile ${config.clan.core.vars.generators.remotebuild.files."ssh.id_ed25519".path}
+            ConnectTimeout 1
         '';
         sshConfig = concatLines (mapAttrsToList mkMatch others);
       in {
diff --git a/flake.nix b/flake.nix
index 3f9a5f6..1be4ecf 100644
--- a/flake.nix
+++ b/flake.nix
@@ -101,7 +101,7 @@
         inventory = {
           machines = {
             moritz-desktop.tags = ["peer" "client" "worker"];
-            moritz-laptop.tags = ["peer"];
+            moritz-laptop.tags = ["peer" "client" "worker"];
             moritz-server.tags = ["client" "worker"];
           };
           instances."remote-builders" = {