diff --git a/docs/continuous-integration.md b/docs/continuous-integration.md
index 1b04d60ed..29f946414 100644
--- a/docs/continuous-integration.md
+++ b/docs/continuous-integration.md
@@ -17,9 +17,7 @@ See [here](./infrastructure.md#continuous-integration) for details about the har
 
 _Buildbot is the only CI system that supports pull requests from forked repositories._
 
-To enable buildbot add the [`nix-community-buildbot`](https://github.com/topics/nix-community-buildbot) topic to the repository.
-
-_Newly enabled repos are imported into buildbot twice a day, you can also ask the admins to trigger an import manually._
+To enable buildbot add the repository to the `repoAllowlist` in this [file](https://github.com/nix-community/infra/blob/master/modules/nixos/buildbot.nix).
 
 #### Hercules
 
diff --git a/flake.lock b/flake.lock
index af506279f..1940fb754 100644
--- a/flake.lock
+++ b/flake.lock
@@ -16,11 +16,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1751515480,
-        "narHash": "sha256-vCYcc/b8WizF6vnjuRVxSiU8hy9L3vOTWDVKpWM7xRE=",
+        "lastModified": 1752362477,
+        "narHash": "sha256-+8MLBdYkXJPM73pLVRaee147wW/EwUZogMcG49CZgWY=",
         "owner": "nix-community",
         "repo": "buildbot-nix",
-        "rev": "47ad4c7afb169df6f9d48d0df3d7e2f71d9ddd8f",
+        "rev": "e2ee963b1e9aba369db08b34456b6d79c3de37db",
         "type": "github"
       },
       "original": {
diff --git a/modules/nixos/buildbot.nix b/modules/nixos/buildbot.nix
index 7f15d808c..5a94d6acf 100644
--- a/modules/nixos/buildbot.nix
+++ b/modules/nixos/buildbot.nix
@@ -5,6 +5,32 @@
   ...
 }:
 let
+  repoAllowlist = [
+    # keep-sorted start case=no
+    "nix-community/authentik-nix"
+    "nix-community/autofirma-nix"
+    "nix-community/dream2nix"
+    "nix-community/ethereum.nix"
+    "nix-community/infra"
+    "nix-community/lanzaboote"
+    "nix-community/neovim-nightly-overlay"
+    "nix-community/nh"
+    "nix-community/nix-direnv"
+    "nix-community/nix-eval-jobs"
+    "nix-community/nix-index"
+    "nix-community/nix4nvchad"
+    "nix-community/NixNG"
+    "nix-community/nixos-facter"
+    "nix-community/nixos-facter-modules"
+    "nix-community/nixos-generators"
+    "nix-community/nixos-images"
+    "nix-community/nixpkgs-update"
+    "nix-community/nixpkgs-xr"
+    "nix-community/nixvim"
+    "nix-community/srvos"
+    # keep-sorted end
+  ];
+
   buildSystems = [
     pkgs.stdenv.hostPlatform.system
   ] ++ builtins.concatLists (map (host: host.systems) config.nix.buildMachines);
@@ -44,6 +70,7 @@ in
     inherit buildSystems;
     domain = "buildbot.nix-community.org";
     outputsPath = "/var/www/buildbot/nix-outputs/";
+    showTrace = true;
     evalMaxMemorySize = 4096;
     evalWorkerCount = 32;
     jobReportLimit = 0;
@@ -61,10 +88,16 @@ in
       webhookSecretFile = config.sops.secrets.buildbot-github-webhook-secret.path;
       oauthSecretFile = config.sops.secrets.buildbot-github-oauth-secret.path;
       oauthId = "Iv23liN9rjd1Bm3bvYKZ";
-      topic = "nix-community-buildbot";
+      topic = null;
+      inherit repoAllowlist;
     };
   };
 
+  # reset github project cache when starting service
+  systemd.services.buildbot-master.preStart = pkgs.lib.mkAfter ''
+    rm /var/lib/buildbot/github-*.json
+  '';
+
   sops.secrets.buildbot-effects-nix-community-infra = { };
 
   services.buildbot-nix.master.effects.perRepoSecretFiles = {
diff --git a/terraform/github-repo-infra.tf b/terraform/github-repo-infra.tf
index 53626bb62..820e66592 100644
--- a/terraform/github-repo-infra.tf
+++ b/terraform/github-repo-infra.tf
@@ -4,7 +4,6 @@ resource "github_repository" "infra" {
   homepage_url = "https://nix-community.org"
 
   topics = [
-    "nix-community-buildbot",
     "nix-darwin",
     "nixos",
     "terraform",