diff --git a/machines/orbi/buildbot-master.nix b/machines/orbi/buildbot-master.nix
deleted file mode 100644
index 08419c5..0000000
--- a/machines/orbi/buildbot-master.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{ pkgs, inputs, ... }: {
-
-  imports = [
-    inputs.buildbot-nix.nixosModules.buildbot-master
-  ];
-
-  containers.buildbot = {
-    privateNetwork = false;
-    autoStart = true;
-
-    config = { config, lib, ... }: {
-      nixpkgs.pkgs = pkgs;
-      imports = [
-        ../../components/monitor/container.nix
-        inputs.buildbot-nix.nixosModules.buildbot-master
-      ];
-      system.stateVersion = "24.05";
-      services.logrotate.checkConfig = false; # because uid 3000 does not exist in here
-
-      services.postgresql = {
-        settings.port = 5433;
-      };
-
-      services.buildbot-nix.master = {
-        enable = true;
-        dbUrl = "postgresql://@:5433/buildbot";
-        # Domain name under which the buildbot frontend is reachable
-        domain = "orbi.private:8010";
-        admins = [ "palo" ];
-        workersFile = pkgs.writeText "workers.json" ''
-          [
-            { "name": "test", "pass": "password", "cores": 2 }
-          ]
-        '';
-
-        # How to authenticate against buildbot
-        authBackend = "none";
-
-        # How to authenticate against gitea
-        gitea = {
-          enable = true;
-          instanceUrl = "https://git.ingolf-wagner.de";
-          webhookSecretFile = pkgs.writeText "gitea-webhook-secret" "my-secret";
-          tokenFile = pkgs.writeText "gitea-token" "my-token";
-          topic = "buildbot";
-        };
-
-      };
-
-    };
-  };
-
-}
diff --git a/machines/orbi/buildbot-worker.nix b/machines/orbi/buildbot-worker.nix
deleted file mode 100644
index abfe3aa..0000000
--- a/machines/orbi/buildbot-worker.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ pkgs, inputs, ... }: {
-
-  imports = [
-    inputs.buildbot-nix.nixosModules.buildbot-worker
-  ];
-
-  services.buildbot-nix.worker = {
-    enable = true;
-    workerPasswordFile = pkgs.writeText "worker-password-file" "password";
-  };
-
-}
diff --git a/machines/orbi/configuration.nix b/machines/orbi/configuration.nix
index 237ce3d..73c58b8 100644
--- a/machines/orbi/configuration.nix
+++ b/machines/orbi/configuration.nix
@@ -35,9 +35,6 @@
     #./social-jitsi.nix
     ./social-matrix-terranix.nix
 
-    #./buildbot-worker.nix
-    #./buildbot-master.nix
-
   ];
   services.logrotate.checkConfig = false; # because uid 3000 does not exist in here