diff --git a/flake.lock b/flake.lock
index 6b02f14..9153baf 100644
--- a/flake.lock
+++ b/flake.lock
@@ -21,6 +21,30 @@
         "type": "github"
       }
     },
+    "buildbot-nix": {
+      "inputs": {
+        "flake-parts": [
+          "flake-parts"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "treefmt-nix": "treefmt-nix"
+      },
+      "locked": {
+        "lastModified": 1717033539,
+        "narHash": "sha256-vWQLnmZSipvaosXnGze8aSqlEzaAF9PhA5sh2QYNvTc=",
+        "owner": "Mic92",
+        "repo": "buildbot-nix",
+        "rev": "ad165ae64f877adc6156b8f21c31fc74144dc8e4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Mic92",
+        "repo": "buildbot-nix",
+        "type": "github"
+      }
+    },
     "clan-core": {
       "inputs": {
         "disko": "disko",
@@ -32,7 +56,7 @@
           "nixpkgs"
         ],
         "sops-nix": "sops-nix",
-        "treefmt-nix": "treefmt-nix"
+        "treefmt-nix": "treefmt-nix_2"
       },
       "locked": {
         "lastModified": 1714824847,
@@ -540,7 +564,7 @@
           "nixpkgs"
         ],
         "systems": "systems_6",
-        "treefmt-nix": "treefmt-nix_2"
+        "treefmt-nix": "treefmt-nix_3"
       },
       "locked": {
         "lastModified": 1714925202,
@@ -590,6 +614,7 @@
     "root": {
       "inputs": {
         "audio-scripts": "audio-scripts",
+        "buildbot-nix": "buildbot-nix",
         "clan-core": "clan-core",
         "flake-parts": "flake-parts",
         "ha-ara-menu": "ha-ara-menu",
@@ -783,6 +808,27 @@
       }
     },
     "treefmt-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "buildbot-nix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1715940852,
+        "narHash": "sha256-wJqHMg/K6X3JGAE9YLM0LsuKrKb4XiBeVaoeMNlReZg=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "2fba33a182602b9d49f0b2440513e5ee091d838b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
+    },
+    "treefmt-nix_2": {
       "inputs": {
         "nixpkgs": [
           "clan-core",
@@ -803,7 +849,7 @@
         "type": "github"
       }
     },
-    "treefmt-nix_2": {
+    "treefmt-nix_3": {
       "inputs": {
         "nixpkgs": [
           "poetry2nix",
diff --git a/machines/gum/config.nix b/machines/gum/config.nix
index a0dac6e..481c080 100644
--- a/machines/gum/config.nix
+++ b/machines/gum/config.nix
@@ -154,6 +154,9 @@ in {
       ../../2configs/deployment/ntfysh.nix
       ../../2configs/deployment/nextcloud #postgres backend
       ../../2configs/deployment/nextcloud/screeenly.nix
+
+      ../../2configs/deployment/buildbot/master.nix
+      ../../2configs/deployment/buildbot/worker.nix
       ### Moving owncloud data dir to /media/cloud/nextcloud-data
       {
         users.users.nextcloud.extraGroups = [ "download" ];
diff --git a/machines/tsp/config.nix b/machines/tsp/config.nix
index 86f58ed..91fdea0 100644
--- a/machines/tsp/config.nix
+++ b/machines/tsp/config.nix
@@ -33,4 +33,5 @@
     ];
 
   nixpkgs.config.allowUnfree = true;
+  krebs.build.host = config.krebs.hosts.tsp;
 }