diff --git a/infra/config/config.star b/infra/config/config.star
index 3bad47e819..cc71e1ec50 100755
--- a/infra/config/config.star
+++ b/infra/config/config.star
@@ -527,7 +527,7 @@ def ci_builder(
 
     if enabled:
         add_milo(name, {"ci": ci_cat, "perf": perf_cat})
-        if ci_cat:
+        if ci_cat and not perf_cat:
             lkgr_builders.append(name)
     dimensions.update({"pool": "luci.webrtc.ci", "cpu": kwargs.pop("cpu", DEFAULT_CPU)})
     properties = properties or {}
diff --git a/infra/config/cr-buildbucket.cfg b/infra/config/cr-buildbucket.cfg
index 2873827e3f..1be58239fc 100644
--- a/infra/config/cr-buildbucket.cfg
+++ b/infra/config/cr-buildbucket.cfg
@@ -2031,11 +2031,9 @@ buckets {
         '          "Android32 (M Nexus5X)",'
         '          "Android32 (M Nexus5X)(dbg)",'
         '          "Android32 (more configs)",'
-        '          "Android32 Builder arm",'
         '          "Android32 Builder x86",'
         '          "Android32 Builder x86 (dbg)",'
         '          "Android64 (M Nexus5X)",'
-        '          "Android64 Builder arm64",'
         '          "Android64 Builder x64 (dbg)",'
         '          "Linux (more configs)",'
         '          "Linux Asan",'
@@ -2047,7 +2045,6 @@ buckets {
         '          "Linux32 Debug (ARM)",'
         '          "Linux32 Release",'
         '          "Linux32 Release (ARM)",'
-        '          "Linux64 Builder",'
         '          "Linux64 Debug",'
         '          "Linux64 Debug (ARM)",'
         '          "Linux64 Release",'