diff --git a/machines/thinkman/configuration.nix b/machines/thinkman/configuration.nix
index 3aa83a1..b39c21d 100644
--- a/machines/thinkman/configuration.nix
+++ b/machines/thinkman/configuration.nix
@@ -6,6 +6,7 @@
     ./hardware-configuration.nix
     ./network.nix
     ./profiles.nix
+    ./remote-build.nix
     ./services.nix
     ./system.nix
   ];
diff --git a/machines/thinkman/remote-build.nix b/machines/thinkman/remote-build.nix
new file mode 100644
index 0000000..32512f7
--- /dev/null
+++ b/machines/thinkman/remote-build.nix
@@ -0,0 +1,19 @@
+# enabled remote-build service
+{ config, ... }:
+let
+  inherit (config.sops) secrets;
+in
+{
+  sops.secrets."nixremote/ssh_key" = { };
+  nix.buildMachines = [
+    {
+      hostName = "buehler.rocks";
+      system = "x86_64-linux";
+      supportedFeatures = [ "nixos-test" "benchmark" "kvm" "big-parallel" ];
+      sshUser = "nixremote";
+      sshKey = secrets."nixremote/ssh_key".path;
+    }
+  ];
+
+  nix.distributedBuilds = true;
+}
diff --git a/machines/thinkman/secrets.yaml b/machines/thinkman/secrets.yaml
index d4f3b77..0103219 100644
--- a/machines/thinkman/secrets.yaml
+++ b/machines/thinkman/secrets.yaml
@@ -4,6 +4,8 @@ users:
 borgbackup:
     password: ENC[AES256_GCM,data:RF385VVV1aUjZA5FcJGwizhiAlINW7HiFA==,iv:W1+khhHyKfDKD7vs0t442g28MJ+0zu5ZpKYMmrmvEyM=,tag:whQ4euwgukHaTTJIAwpYSg==,type:str]
     ssh_key: ENC[AES256_GCM,data:oEh9OKq14UvCfUIasqMTOX9cfLUTbWK7CWLjdlAw3yxgqSZFM79kr6a7OfVZ7Uv1ycqdH/qYt3OVU+CCvy9KFzn/zQFHJnN6r5vSwOYU2/TnnlAwAp6XBWwN1SNUt5Xcf/MQEu3BJlvGewVC0ApkutcZdvQKTUDbKuThhZ5P7n8+y2CZZvGBc1lpd0DfMpmGbBES27TRclycj5YHmyOPQOI0Nvbieh3GByKIouvoQY6LKuBVOrxVptJYKY7Wjv+EjpQrSc/SX/OIv2fYxrhrZgT+LjOnIp+bMduhIvDH5kI47KZSauyJxQXPK+ZqJ9C2SlABsODvHkY518qOZNFN56X486AnWnP+2CCx5VQxT13msUWzmtZagc0gKqZgNw+NnLtsG6m2rUj5peKjuxjCBK+BVloKbGyfvj6VgZvQQlAS1TEgcnWYRfeoT8gX4FmvxX4yMILiyZrkDfzchOI4giOlX2y6hvXGr5Qr0gTzQruwnSYZ9M+wxg+sZdLl0q+07nwRqjlPQHah5vd5Qz7q,iv:9N1aRbHAcSPt3v/ZrKyJODNDn3gw8ttMC/gmamHgxwU=,tag:NhZSGu7139hsPSprdvItPg==,type:str]
+nixremote:
+    ssh_key: ENC[AES256_GCM,data:vO3U1dW3VhHSNDDFlt6Slqf2+sf0xeZ/3ztyqGIkUKwU87flHP0cVVyPF71UCSowhFu7SSK/DEkzTdNjoCnx21HDQ5zc+JZFJjKIE7HotcJwWR6/a9hFZniY4FVLAnW+locWjbcOB+Mou/VHm1uo+a8wmNOJTw7FS3ZM6FfANLDZcjxcjJKu23UcUyXDxuMySkRKmLneyfwlk5aP1toyjBwnS9og1UPjSTy6ldM6gsfUv1mZ+BbCWgtiwxcGEy859ROOMuqKxUKGDbgHnby/aqs7dP8xzoVoZQXjHYoWLp1/7IforoyXb8GiUkOWRlCC/dJm6Kx9Y67M13LwKEpX2+WOfNCHqTjYO4234zfOZ1DRJtwCAMKH7y0sjAYp9bK6iHv3qKIjreDSA8S6xbQP5LnXvp55460Puq+Xe2HdnugRfd3d6pKMrHmnRE8mmstG6jDxdGqtoGo2VBvDGAC080J6BXxP0/xpeXwc99TSDdHEymqodZoz3jQuGMb+brxSyDgaw6FEDPNkpxdUFl0/vShTfROqgT0NVbH3,iv:SXIDRjHBQBcstSz1Pgv5jI8+XHbJA/QrqF9EOkIcvqE=,tag:ZakbophvoJmWlVX88hMA7A==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -28,8 +30,8 @@ sops:
             bzY2ZTY1QUtSRjlOZ1E0Vkw5Q1cxYmMKqwvWUv2XpRIenGwCpZuwKQc0ZsiX2AAx
             pmIh4f10G7wr1rLeodRi2KxYIrrudPbxEWIuzmBRyHc7+3EPpzLetw==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2023-11-13T22:35:21Z"
-    mac: ENC[AES256_GCM,data:793v+gkbUDjSEPGR+i6DqkJZnLzQN6zl9skzNxYRgvu6SvzScdDh28EPRfCWont2PIRd9DZYBmfycrMCAojDqaeeDzjIPpKLR5HydsT8DAuAMs9bjmDygi6rQktUz1avLHbGq89HM7vO7x4TTw2Y9eA275H4OboIX0GbYd8yXZM=,iv:En9dRzxMvgHpYYlRSNKgB0czxRRJ1u//B+Gk8oNi4oc=,tag:5rFkNs0RZE+CHan3esJV7Q==,type:str]
+    lastmodified: "2024-03-14T23:58:29Z"
+    mac: ENC[AES256_GCM,data:LbsoPjZifAaODMKtBz7h2/kA/GcSHNNHQfEyl4NMAJMd//45orc72R3KlyNKoNjx32xTXX/8uNX+9iCVegawJ+pdHrQTM+gCEhuxeN5fXNrl3jwi5p1A34EyLOxM+05QQiUYlBLJhTYOU0A6/o9zCClTXHbXnnUxRWNclkYo1oI=,iv:bOlcGrTzz6LpheOsE7ASkjA9w4I6l6FTYd5RSG2uI2U=,tag:vR/7HUFTCwU4YOHgqjC3mw==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.8.1