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" = {
diff --git a/vars/per-machine/moritz-laptop/remotebuild/ssh.id_ed25519.pub/value b/vars/per-machine/moritz-laptop/remotebuild/ssh.id_ed25519.pub/value
new file mode 100644
index 0000000..0f7e1be
--- /dev/null
+++ b/vars/per-machine/moritz-laptop/remotebuild/ssh.id_ed25519.pub/value
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB54huDhPJcgD/a2YF3Cpd6vvFfXKOykehJSyJ2xBkwe nixbld@moritz-laptop
diff --git a/vars/per-machine/moritz-laptop/remotebuild/ssh.id_ed25519/machines/moritz-laptop b/vars/per-machine/moritz-laptop/remotebuild/ssh.id_ed25519/machines/moritz-laptop
new file mode 120000
index 0000000..60d1226
--- /dev/null
+++ b/vars/per-machine/moritz-laptop/remotebuild/ssh.id_ed25519/machines/moritz-laptop
@@ -0,0 +1 @@
+../../../../../../sops/machines/moritz-laptop
\ No newline at end of file
diff --git a/vars/per-machine/moritz-laptop/remotebuild/ssh.id_ed25519/secret b/vars/per-machine/moritz-laptop/remotebuild/ssh.id_ed25519/secret
new file mode 100644
index 0000000..78131e4
--- /dev/null
+++ b/vars/per-machine/moritz-laptop/remotebuild/ssh.id_ed25519/secret
@@ -0,0 +1,19 @@
+{
+	"data": "ENC[AES256_GCM,data:K3RZVlCygYU3VQ2Iq3nxmd6+8BmXBX24xnmsszEBCQTQMm+je/GjsUQZljdwEqr593fMUEB5NvKh+u4mR0G8TXvcvl/xpppS1tGoZmAIxwrt9yZ1p0O3fYRyVt0CzQ/Sl4GFjgcbP8AzWIYXwLhL5Q8tTnvLinSXsU1K2B0H406biFU6ps5rUt7dKPsGcdXC/pQ7AnmCWifeFmhZSOUP05W/k07rCqo0lz3h+XNfRkaWkSw4pAhUwTHxyP79on0LZXWjP+2VTJPIlJa/myEC8oLNthg/N4yuvVLP7dLyngAnnuZOiswYVp3nc7PbINRuZZwZ6ayVtN7seGp+wmczyZlTKM/ebIp8ZktTm4HNeHblj/OtUMaACiUP2wPgjmLcfr/ZXj3NadiD35IhgLOZk9qKldbu3ncsmiLKyq+9jNFOI9TbHwg3hvEf4asuTJZfb7w3oTBQNrl5MoQPmM04jcpMFlJavcSRKjq0uQ/uJ2wsNMhsmc06JLh1o1BGyyPWc7AbNo/k6XHJH2gsRnTPDbA78oNsBxNRzFF4,iv:6Zct3dC7Z69b/khv0aOvKPZpj+IlKW/nlCIuLA33T9Q=,tag:mTvCN3GPAOMo0TXzx2rX5w==,type:str]",
+	"sops": {
+		"age": [
+			{
+				"recipient": "age12jlzcjwwhtgws4ku4nemwknsps3a6um74kdpxfv9pzvgdlhufp8q08c0j7",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBUcGQ3VGswaVJMVHpCSHRu\naFI2b1ozR0F0Ym9oRmYyZm9KSHFCWmNFdWhrCkhqTWZSQXB3aVdDVTVZMUZqV2lL\nOXVQTElkWFhrU29WaEtWOXl3eEJjdTQKLS0tIDBXU2JCY3A5QjloZFM4ZEFHaXl5\nZ0hESjRlMUxlMGQ5eHYrczBMVldPYncKZ4jfAOo7XlLgjp+D2XfXksuNP7nHZFH/\ndFXf8KwFgTAZYyVHdX44t+b5tAMwSdmM8VaL5uHsIcQ1OxBGnAiRUg==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age1rgyueg2rnfw2er0rzkc6dc97p38fekjujdusfje6xn7g40plpfrshrlsyu",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSArYjNJYWhZcWJINVhLZGVN\nZHFRVUdQL2J0bWF0SjFNUnVLWlZBK2FGZld3ClZMLzNXREpwZENiaFJzZGVDZTd2\nZUkyZDN2Z3FpTzd5VEkwWHdWUlhrT00KLS0tIHNLTTBmWTY5NHhEUjVhdTc1NXJG\nZXMzNXp3ejhyTnUwUk1VRWdFU0VWenMKt4fQMOBQFQRVG/PTlUP92MzstZu5/jcx\nKwguvLj8G+rAB3zm3VcBigJ96HEqXSZDS+rNXfGFnT41XV/6PW9DZQ==\n-----END AGE ENCRYPTED FILE-----\n"
+			}
+		],
+		"lastmodified": "2025-04-21T08:56:45Z",
+		"mac": "ENC[AES256_GCM,data:kCKQOGiXOQ6rxqv8wau39qY4cW71O6qMXD5Pz46UJye2MusroSPUu4nYtYqi4bGGMv5t1Hay0XFTIwWAYlhtAKlC4sprgLHM83l+EpWs3JGk5crf4VcLTv7X+72QZjmQD76M7+wRTSM9JJh+OgGPHBdPn7SP6sEKe5mteBDgj3A=,iv:hRlfGyLiAolqIbCpnCJjb+lYbmHd2Xz9NJYc9HXsQWc=,tag:+3IWb8a9tPM8eazQytnOww==,type:str]",
+		"unencrypted_suffix": "_unencrypted",
+		"version": "3.10.1"
+	}
+}
diff --git a/vars/per-machine/moritz-laptop/remotebuild/ssh.id_ed25519/users/moritz b/vars/per-machine/moritz-laptop/remotebuild/ssh.id_ed25519/users/moritz
new file mode 120000
index 0000000..1b45802
--- /dev/null
+++ b/vars/per-machine/moritz-laptop/remotebuild/ssh.id_ed25519/users/moritz
@@ -0,0 +1 @@
+../../../../../../sops/users/moritz
\ No newline at end of file