diff --git a/infra/config/config.star b/infra/config/config.star
index 8be9be5493..3bad47e819 100755
--- a/infra/config/config.star
+++ b/infra/config/config.star
@@ -539,7 +539,7 @@ def ci_builder(
         name = name,
         dimensions = dimensions,
         properties = properties,
-        bucket = "ci",
+        bucket = "perf" if perf_cat else "ci",
         service_account = "webrtc-ci-builder@chops-service-accounts.iam.gserviceaccount.com",
         triggered_by = ["webrtc-gitiles-trigger-main"] if enabled else None,
         repo = WEBRTC_GIT,
diff --git a/infra/config/cr-buildbucket.cfg b/infra/config/cr-buildbucket.cfg
index af6fa26ae8..2873827e3f 100644
--- a/infra/config/cr-buildbucket.cfg
+++ b/infra/config/cr-buildbucket.cfg
@@ -165,55 +165,6 @@ buckets {
         }
       }
     }
-    builders {
-      name: "Android32 Builder arm"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.webrtc.ci"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/resultdb/test_presentation": {'
-        '    "column_keys": [],'
-        '    "grouping_keys": ['
-        '      "status",'
-        '      "v.test_suite"'
-        '    ]'
-        '  },'
-        '  "builder_group": "client.webrtc",'
-        '  "recipe": "webrtc/standalone"'
-        '}'
-      priority: 29
-      execution_timeout_secs: 7200
-      build_numbers: YES
-      service_account: "webrtc-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "webrtc-ci"
-          dataset: "resultdb"
-          table: "ci_test_results"
-          test_results {}
-        }
-      }
-    }
     builders {
       name: "Android32 Builder x86"
       swarming_host: "chromium-swarm.appspot.com"
@@ -361,55 +312,6 @@ buckets {
         }
       }
     }
-    builders {
-      name: "Android64 Builder arm64"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.webrtc.ci"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/resultdb/test_presentation": {'
-        '    "column_keys": [],'
-        '    "grouping_keys": ['
-        '      "status",'
-        '      "v.test_suite"'
-        '    ]'
-        '  },'
-        '  "builder_group": "client.webrtc",'
-        '  "recipe": "webrtc/standalone"'
-        '}'
-      priority: 29
-      execution_timeout_secs: 7200
-      build_numbers: YES
-      service_account: "webrtc-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "webrtc-ci"
-          dataset: "resultdb"
-          table: "ci_test_results"
-          test_results {}
-        }
-      }
-    }
     builders {
       name: "Android64 Builder x64 (dbg)"
       swarming_host: "chromium-swarm.appspot.com"
@@ -959,56 +861,6 @@ buckets {
         }
       }
     }
-    builders {
-      name: "Linux64 Builder"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "inside_docker:0"
-      dimensions: "os:Linux"
-      dimensions: "pool:luci.webrtc.ci"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/resultdb/test_presentation": {'
-        '    "column_keys": [],'
-        '    "grouping_keys": ['
-        '      "status",'
-        '      "v.test_suite"'
-        '    ]'
-        '  },'
-        '  "builder_group": "client.webrtc",'
-        '  "recipe": "webrtc/standalone"'
-        '}'
-      priority: 29
-      execution_timeout_secs: 7200
-      build_numbers: YES
-      service_account: "webrtc-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "webrtc-ci"
-          dataset: "resultdb"
-          table: "ci_test_results"
-          test_results {}
-        }
-      }
-    }
     builders {
       name: "Linux64 Debug"
       swarming_host: "chromium-swarm.appspot.com"
@@ -1308,55 +1160,6 @@ buckets {
         }
       }
     }
-    builders {
-      name: "Mac64 Builder"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Mac"
-      dimensions: "pool:luci.webrtc.ci"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/resultdb/test_presentation": {'
-        '    "column_keys": [],'
-        '    "grouping_keys": ['
-        '      "status",'
-        '      "v.test_suite"'
-        '    ]'
-        '  },'
-        '  "builder_group": "client.webrtc",'
-        '  "recipe": "webrtc/standalone"'
-        '}'
-      priority: 30
-      execution_timeout_secs: 7200
-      build_numbers: YES
-      service_account: "webrtc-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "webrtc-ci"
-          dataset: "resultdb"
-          table: "ci_test_results"
-          test_results {}
-        }
-      }
-    }
     builders {
       name: "Mac64 Debug"
       swarming_host: "chromium-swarm.appspot.com"
@@ -1553,55 +1356,6 @@ buckets {
         }
       }
     }
-    builders {
-      name: "Win32 Builder (Clang)"
-      swarming_host: "chromium-swarm.appspot.com"
-      swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows"
-      dimensions: "pool:luci.webrtc.ci"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$build/goma": {'
-        '    "server_host": "goma.chromium.org",'
-        '    "use_luci_auth": true'
-        '  },'
-        '  "$recipe_engine/isolated": {'
-        '    "server": "https://isolateserver.appspot.com"'
-        '  },'
-        '  "$recipe_engine/resultdb/test_presentation": {'
-        '    "column_keys": [],'
-        '    "grouping_keys": ['
-        '      "status",'
-        '      "v.test_suite"'
-        '    ]'
-        '  },'
-        '  "builder_group": "client.webrtc",'
-        '  "recipe": "webrtc/standalone"'
-        '}'
-      priority: 30
-      execution_timeout_secs: 7200
-      build_numbers: YES
-      service_account: "webrtc-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "webrtc-ci"
-          dataset: "resultdb"
-          table: "ci_test_results"
-          test_results {}
-        }
-      }
-    }
     builders {
       name: "Win32 Debug (Clang)"
       swarming_host: "chromium-swarm.appspot.com"
@@ -2404,6 +2158,203 @@ buckets {
     identity: "user:webrtc-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
   }
   swarming {
+    builders {
+      name: "Android32 Builder arm"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.webrtc.ci"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "client.webrtc",'
+        '  "recipe": "webrtc/standalone"'
+        '}'
+      priority: 29
+      execution_timeout_secs: 7200
+      build_numbers: YES
+      service_account: "webrtc-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "webrtc-ci"
+          dataset: "resultdb"
+          table: "perf_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Android64 Builder arm64"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.webrtc.ci"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "client.webrtc",'
+        '  "recipe": "webrtc/standalone"'
+        '}'
+      priority: 29
+      execution_timeout_secs: 7200
+      build_numbers: YES
+      service_account: "webrtc-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "webrtc-ci"
+          dataset: "resultdb"
+          table: "perf_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Linux64 Builder"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "inside_docker:0"
+      dimensions: "os:Linux"
+      dimensions: "pool:luci.webrtc.ci"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "client.webrtc",'
+        '  "recipe": "webrtc/standalone"'
+        '}'
+      priority: 29
+      execution_timeout_secs: 7200
+      build_numbers: YES
+      service_account: "webrtc-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "webrtc-ci"
+          dataset: "resultdb"
+          table: "perf_test_results"
+          test_results {}
+        }
+      }
+    }
+    builders {
+      name: "Mac64 Builder"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.webrtc.ci"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "client.webrtc",'
+        '  "recipe": "webrtc/standalone"'
+        '}'
+      priority: 30
+      execution_timeout_secs: 7200
+      build_numbers: YES
+      service_account: "webrtc-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "webrtc-ci"
+          dataset: "resultdb"
+          table: "perf_test_results"
+          test_results {}
+        }
+      }
+    }
     builders {
       name: "Perf Android32 (M AOSP Nexus6)"
       swarming_host: "chromium-swarm.appspot.com"
@@ -2788,6 +2739,55 @@ buckets {
         }
       }
     }
+    builders {
+      name: "Win32 Builder (Clang)"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.webrtc.ci"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "server_host": "goma.chromium.org",'
+        '    "use_luci_auth": true'
+        '  },'
+        '  "$recipe_engine/isolated": {'
+        '    "server": "https://isolateserver.appspot.com"'
+        '  },'
+        '  "$recipe_engine/resultdb/test_presentation": {'
+        '    "column_keys": [],'
+        '    "grouping_keys": ['
+        '      "status",'
+        '      "v.test_suite"'
+        '    ]'
+        '  },'
+        '  "builder_group": "client.webrtc",'
+        '  "recipe": "webrtc/standalone"'
+        '}'
+      priority: 30
+      execution_timeout_secs: 7200
+      build_numbers: YES
+      service_account: "webrtc-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "webrtc-ci"
+          dataset: "resultdb"
+          table: "perf_test_results"
+          test_results {}
+        }
+      }
+    }
   }
 }
 buckets {
diff --git a/infra/config/luci-milo.cfg b/infra/config/luci-milo.cfg
index c598665644..cb9491ebe6 100644
--- a/infra/config/luci-milo.cfg
+++ b/infra/config/luci-milo.cfg
@@ -22,7 +22,7 @@ consoles {
     short_name: "rel"
   }
   builders {
-    name: "buildbucket/luci.webrtc.ci/Android32 Builder arm"
+    name: "buildbucket/luci.webrtc.perf/Android32 Builder arm"
     category: "Android|arm"
     short_name: "size"
   }
@@ -32,7 +32,7 @@ consoles {
     short_name: "rel"
   }
   builders {
-    name: "buildbucket/luci.webrtc.ci/Android64 Builder arm64"
+    name: "buildbucket/luci.webrtc.perf/Android64 Builder arm64"
     category: "Android|arm64"
     short_name: "size"
   }
@@ -107,7 +107,7 @@ consoles {
     short_name: "rel"
   }
   builders {
-    name: "buildbucket/luci.webrtc.ci/Linux64 Builder"
+    name: "buildbucket/luci.webrtc.perf/Linux64 Builder"
     category: "Linux|x64"
     short_name: "size"
   }
@@ -286,7 +286,7 @@ consoles {
   refs: "regexp:refs/heads/main"
   manifest_name: "REVISION"
   builders {
-    name: "buildbucket/luci.webrtc.ci/Android32 Builder arm"
+    name: "buildbucket/luci.webrtc.perf/Android32 Builder arm"
     category: "Android|arm|Builder"
   }
   builders {
@@ -300,7 +300,7 @@ consoles {
     short_name: "M AOSP Nexus6"
   }
   builders {
-    name: "buildbucket/luci.webrtc.ci/Android64 Builder arm64"
+    name: "buildbucket/luci.webrtc.perf/Android64 Builder arm64"
     category: "Android|arm64|Builder"
   }
   builders {
@@ -314,7 +314,7 @@ consoles {
     short_name: "O Pixel2"
   }
   builders {
-    name: "buildbucket/luci.webrtc.ci/Linux64 Builder"
+    name: "buildbucket/luci.webrtc.perf/Linux64 Builder"
     category: "Linux|x64|Builder"
   }
   builders {
@@ -328,7 +328,7 @@ consoles {
     short_name: "Bionic"
   }
   builders {
-    name: "buildbucket/luci.webrtc.ci/Mac64 Builder"
+    name: "buildbucket/luci.webrtc.perf/Mac64 Builder"
     category: "Mac|x64|Builder"
   }
   builders {
@@ -337,7 +337,7 @@ consoles {
     short_name: "10.11"
   }
   builders {
-    name: "buildbucket/luci.webrtc.ci/Win32 Builder (Clang)"
+    name: "buildbucket/luci.webrtc.perf/Win32 Builder (Clang)"
     category: "Win|x86|Builder"
   }
   builders {
diff --git a/infra/config/luci-notify.cfg b/infra/config/luci-notify.cfg
index 4d20b9fd3a..c556153aa8 100644
--- a/infra/config/luci-notify.cfg
+++ b/infra/config/luci-notify.cfg
@@ -85,33 +85,6 @@ notifiers {
     failed_step_regexp_exclude: ".*\\(experimental\\).*"
   }
 }
-notifiers {
-  notifications {
-    on_new_status: INFRA_FAILURE
-    email {
-      recipients: "webrtc-troopers-robots@google.com"
-    }
-    template: "infra_failure"
-  }
-  notifications {
-    on_new_status: FAILURE
-    email {
-      recipients: "webrtc-troopers-robots@google.com"
-    }
-    template: "build_failure"
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci"
-    name: "Android32 Builder arm"
-    repository: "https://webrtc.googlesource.com/src"
-  }
-  tree_closers {
-    tree_status_host: "webrtc-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn"
-    failed_step_regexp_exclude: ".*\\(experimental\\).*"
-  }
-}
 notifiers {
   notifications {
     on_new_status: INFRA_FAILURE
@@ -193,33 +166,6 @@ notifiers {
     failed_step_regexp_exclude: ".*\\(experimental\\).*"
   }
 }
-notifiers {
-  notifications {
-    on_new_status: INFRA_FAILURE
-    email {
-      recipients: "webrtc-troopers-robots@google.com"
-    }
-    template: "infra_failure"
-  }
-  notifications {
-    on_new_status: FAILURE
-    email {
-      recipients: "webrtc-troopers-robots@google.com"
-    }
-    template: "build_failure"
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci"
-    name: "Android64 Builder arm64"
-    repository: "https://webrtc.googlesource.com/src"
-  }
-  tree_closers {
-    tree_status_host: "webrtc-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn"
-    failed_step_regexp_exclude: ".*\\(experimental\\).*"
-  }
-}
 notifiers {
   notifications {
     on_new_status: INFRA_FAILURE
@@ -517,33 +463,6 @@ notifiers {
     failed_step_regexp_exclude: ".*\\(experimental\\).*"
   }
 }
-notifiers {
-  notifications {
-    on_new_status: INFRA_FAILURE
-    email {
-      recipients: "webrtc-troopers-robots@google.com"
-    }
-    template: "infra_failure"
-  }
-  notifications {
-    on_new_status: FAILURE
-    email {
-      recipients: "webrtc-troopers-robots@google.com"
-    }
-    template: "build_failure"
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci"
-    name: "Linux64 Builder"
-    repository: "https://webrtc.googlesource.com/src"
-  }
-  tree_closers {
-    tree_status_host: "webrtc-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn"
-    failed_step_regexp_exclude: ".*\\(experimental\\).*"
-  }
-}
 notifiers {
   notifications {
     on_new_status: INFRA_FAILURE
@@ -706,33 +625,6 @@ notifiers {
     failed_step_regexp_exclude: ".*\\(experimental\\).*"
   }
 }
-notifiers {
-  notifications {
-    on_new_status: INFRA_FAILURE
-    email {
-      recipients: "webrtc-troopers-robots@google.com"
-    }
-    template: "infra_failure"
-  }
-  notifications {
-    on_new_status: FAILURE
-    email {
-      recipients: "webrtc-troopers-robots@google.com"
-    }
-    template: "build_failure"
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci"
-    name: "Mac64 Builder"
-    repository: "https://webrtc.googlesource.com/src"
-  }
-  tree_closers {
-    tree_status_host: "webrtc-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn"
-    failed_step_regexp_exclude: ".*\\(experimental\\).*"
-  }
-}
 notifiers {
   notifications {
     on_new_status: INFRA_FAILURE
@@ -841,33 +733,6 @@ notifiers {
     failed_step_regexp_exclude: ".*\\(experimental\\).*"
   }
 }
-notifiers {
-  notifications {
-    on_new_status: INFRA_FAILURE
-    email {
-      recipients: "webrtc-troopers-robots@google.com"
-    }
-    template: "infra_failure"
-  }
-  notifications {
-    on_new_status: FAILURE
-    email {
-      recipients: "webrtc-troopers-robots@google.com"
-    }
-    template: "build_failure"
-    notify_blamelist {}
-  }
-  builders {
-    bucket: "ci"
-    name: "Win32 Builder (Clang)"
-    repository: "https://webrtc.googlesource.com/src"
-  }
-  tree_closers {
-    tree_status_host: "webrtc-status.appspot.com"
-    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn"
-    failed_step_regexp_exclude: ".*\\(experimental\\).*"
-  }
-}
 notifiers {
   notifications {
     on_new_status: INFRA_FAILURE
@@ -1207,6 +1072,114 @@ notifiers {
     name: "WebRTC version update"
   }
 }
+notifiers {
+  notifications {
+    on_new_status: INFRA_FAILURE
+    email {
+      recipients: "webrtc-troopers-robots@google.com"
+    }
+    template: "infra_failure"
+  }
+  notifications {
+    on_new_status: FAILURE
+    email {
+      recipients: "webrtc-troopers-robots@google.com"
+    }
+    template: "build_failure"
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "perf"
+    name: "Android32 Builder arm"
+    repository: "https://webrtc.googlesource.com/src"
+  }
+  tree_closers {
+    tree_status_host: "webrtc-status.appspot.com"
+    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn"
+    failed_step_regexp_exclude: ".*\\(experimental\\).*"
+  }
+}
+notifiers {
+  notifications {
+    on_new_status: INFRA_FAILURE
+    email {
+      recipients: "webrtc-troopers-robots@google.com"
+    }
+    template: "infra_failure"
+  }
+  notifications {
+    on_new_status: FAILURE
+    email {
+      recipients: "webrtc-troopers-robots@google.com"
+    }
+    template: "build_failure"
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "perf"
+    name: "Android64 Builder arm64"
+    repository: "https://webrtc.googlesource.com/src"
+  }
+  tree_closers {
+    tree_status_host: "webrtc-status.appspot.com"
+    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn"
+    failed_step_regexp_exclude: ".*\\(experimental\\).*"
+  }
+}
+notifiers {
+  notifications {
+    on_new_status: INFRA_FAILURE
+    email {
+      recipients: "webrtc-troopers-robots@google.com"
+    }
+    template: "infra_failure"
+  }
+  notifications {
+    on_new_status: FAILURE
+    email {
+      recipients: "webrtc-troopers-robots@google.com"
+    }
+    template: "build_failure"
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "perf"
+    name: "Linux64 Builder"
+    repository: "https://webrtc.googlesource.com/src"
+  }
+  tree_closers {
+    tree_status_host: "webrtc-status.appspot.com"
+    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn"
+    failed_step_regexp_exclude: ".*\\(experimental\\).*"
+  }
+}
+notifiers {
+  notifications {
+    on_new_status: INFRA_FAILURE
+    email {
+      recipients: "webrtc-troopers-robots@google.com"
+    }
+    template: "infra_failure"
+  }
+  notifications {
+    on_new_status: FAILURE
+    email {
+      recipients: "webrtc-troopers-robots@google.com"
+    }
+    template: "build_failure"
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "perf"
+    name: "Mac64 Builder"
+    repository: "https://webrtc.googlesource.com/src"
+  }
+  tree_closers {
+    tree_status_host: "webrtc-status.appspot.com"
+    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn"
+    failed_step_regexp_exclude: ".*\\(experimental\\).*"
+  }
+}
 notifiers {
   notifications {
     on_new_status: INFRA_FAILURE
@@ -1383,6 +1356,33 @@ notifiers {
     repository: "https://webrtc.googlesource.com/src"
   }
 }
+notifiers {
+  notifications {
+    on_new_status: INFRA_FAILURE
+    email {
+      recipients: "webrtc-troopers-robots@google.com"
+    }
+    template: "infra_failure"
+  }
+  notifications {
+    on_new_status: FAILURE
+    email {
+      recipients: "webrtc-troopers-robots@google.com"
+    }
+    template: "build_failure"
+    notify_blamelist {}
+  }
+  builders {
+    bucket: "perf"
+    name: "Win32 Builder (Clang)"
+    repository: "https://webrtc.googlesource.com/src"
+  }
+  tree_closers {
+    tree_status_host: "webrtc-status.appspot.com"
+    failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update|extract build|cleanup_temp|taskkill|compile|gn"
+    failed_step_regexp_exclude: ".*\\(experimental\\).*"
+  }
+}
 notifiers {
   notifications {
     on_new_status: INFRA_FAILURE
diff --git a/infra/config/luci-scheduler.cfg b/infra/config/luci-scheduler.cfg
index 019db39aea..62fd5c3a10 100644
--- a/infra/config/luci-scheduler.cfg
+++ b/infra/config/luci-scheduler.cfg
@@ -36,8 +36,8 @@ job {
 }
 job {
   id: "Android32 Builder arm"
-  realm: "ci"
-  acl_sets: "ci"
+  realm: "perf"
+  acl_sets: "perf"
   triggering_policy {
     kind: GREEDY_BATCHING
     max_concurrent_invocations: 3
@@ -45,7 +45,7 @@ job {
   }
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
+    bucket: "perf"
     builder: "Android32 Builder arm"
   }
 }
@@ -81,8 +81,8 @@ job {
 }
 job {
   id: "Android64 Builder arm64"
-  realm: "ci"
-  acl_sets: "ci"
+  realm: "perf"
+  acl_sets: "perf"
   triggering_policy {
     kind: GREEDY_BATCHING
     max_concurrent_invocations: 3
@@ -90,7 +90,7 @@ job {
   }
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
+    bucket: "perf"
     builder: "Android64 Builder arm64"
   }
 }
@@ -217,8 +217,8 @@ job {
 }
 job {
   id: "Linux64 Builder"
-  realm: "ci"
-  acl_sets: "ci"
+  realm: "perf"
+  acl_sets: "perf"
   triggering_policy {
     kind: GREEDY_BATCHING
     max_concurrent_invocations: 3
@@ -226,7 +226,7 @@ job {
   }
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
+    bucket: "perf"
     builder: "Linux64 Builder"
   }
 }
@@ -292,11 +292,11 @@ job {
 }
 job {
   id: "Mac64 Builder"
-  realm: "ci"
-  acl_sets: "ci"
+  realm: "perf"
+  acl_sets: "perf"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
+    bucket: "perf"
     builder: "Mac64 Builder"
   }
 }
@@ -508,11 +508,11 @@ job {
 }
 job {
   id: "Win32 Builder (Clang)"
-  realm: "ci"
-  acl_sets: "ci"
+  realm: "perf"
+  acl_sets: "perf"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
+    bucket: "perf"
     builder: "Win32 Builder (Clang)"
   }
 }
@@ -638,11 +638,9 @@ trigger {
   triggers: "Android32 (M Nexus5X)"
   triggers: "Android32 (M Nexus5X)(dbg)"
   triggers: "Android32 (more configs)"
-  triggers: "Android32 Builder arm"
   triggers: "Android32 Builder x86"
   triggers: "Android32 Builder x86 (dbg)"
   triggers: "Android64 (M Nexus5X)"
-  triggers: "Android64 Builder arm64"
   triggers: "Android64 Builder x64 (dbg)"
   triggers: "Linux (more configs)"
   triggers: "Linux Asan"
@@ -654,19 +652,16 @@ trigger {
   triggers: "Linux32 Debug (ARM)"
   triggers: "Linux32 Release"
   triggers: "Linux32 Release (ARM)"
-  triggers: "Linux64 Builder"
   triggers: "Linux64 Debug"
   triggers: "Linux64 Debug (ARM)"
   triggers: "Linux64 Release"
   triggers: "Linux64 Release (ARM)"
   triggers: "Linux64 Release (Libfuzzer)"
   triggers: "Mac Asan"
-  triggers: "Mac64 Builder"
   triggers: "Mac64 Debug"
   triggers: "Mac64 Release"
   triggers: "MacARM64 M1 Release"
   triggers: "Win (more configs)"
-  triggers: "Win32 Builder (Clang)"
   triggers: "Win32 Debug (Clang)"
   triggers: "Win32 Release (Clang)"
   triggers: "Win64 ASan"
@@ -678,6 +673,11 @@ trigger {
   triggers: "iOS64 Sim Debug (iOS 12)"
   triggers: "iOS64 Sim Debug (iOS 13)"
   triggers: "iOS64 Sim Debug (iOS 14.0)"
+  triggers: "Android32 Builder arm"
+  triggers: "Android64 Builder arm64"
+  triggers: "Linux64 Builder"
+  triggers: "Mac64 Builder"
+  triggers: "Win32 Builder (Clang)"
   gitiles {
     repo: "https://webrtc.googlesource.com/src"
     refs: "regexp:refs/heads/main"