diff --git a/infra/config/global/commit-queue.cfg b/infra/config/global/commit-queue.cfg
index fff3ec7c05..f8a7bb62c0 100644
--- a/infra/config/global/commit-queue.cfg
+++ b/infra/config/global/commit-queue.cfg
@@ -36,9 +36,6 @@ config_groups {
       builders {
         name: "tint/try/linux-clang-rel-x64"
       }
-      builders {
-        name: "tint/try/linux-clang-rel-x86"
-      }
       builders {
         name: "tint/try/mac-dbg"
       }
@@ -54,15 +51,6 @@ config_groups {
       builders {
         name: "tint/try/win-clang-rel-x64"
       }
-      builders {
-        name: "tint/try/win-clang-rel-x86"
-      }
-      builders {
-        name: "tint/try/win-msvc-dbg-x64"
-      }
-      builders {
-        name: "tint/try/win-msvc-rel-x64"
-      }
 
       retry_config {
         single_quota: 1
diff --git a/infra/config/global/cr-buildbucket.cfg b/infra/config/global/cr-buildbucket.cfg
index a7702480f8..66b70ee965 100644
--- a/infra/config/global/cr-buildbucket.cfg
+++ b/infra/config/global/cr-buildbucket.cfg
@@ -95,10 +95,6 @@ builder_mixins {
       }
     EOF
   }
-  caches {
-    path: "win_toolchain"
-    name: "win_toolchain"
-  }
 }
 builder_mixins {
   name: "mac"
@@ -132,6 +128,10 @@ buckets {
       dimensions: "pool:luci.flex.ci"
       # We have 32bit test configurations but some of our toolchain is 64bit (like CIPD)
       dimensions: "cpu:x86-64"
+      caches {
+        path: "win_toolchain"
+        name: "win_toolchain"
+      }
       recipe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
@@ -144,28 +144,24 @@ buckets {
     builders {
       name: "linux-clang-dbg-x64"
       mixins: "linux"
-      mixins: "clang"
       mixins: "debug"
       mixins: "x64"
     }
     builders {
       name: "linux-clang-dbg-x86"
       mixins: "linux"
-      mixins: "clang"
       mixins: "debug"
       mixins: "x86"
     }
     builders {
       name: "linux-clang-rel-x64"
       mixins: "linux"
-      mixins: "clang"
       mixins: "release"
       mixins: "x64"
     }
     builders {
       name: "linux-clang-rel-x86"
       mixins: "linux"
-      mixins: "clang"
       mixins: "release"
       mixins: "x86"
     }
@@ -174,16 +170,12 @@ buckets {
     builders {
       name: "mac-dbg"
       mixins: "mac"
-      mixins: "clang"
       mixins: "debug"
-      mixins: "x64"
     }
     builders {
       name: "mac-rel"
       mixins: "mac"
-      mixins: "clang"
       mixins: "release"
-      mixins: "x64"
     }
 
     # Windows: test combinations of {clang,msvc}x{release,debug}x{x86,x64}
@@ -246,6 +238,10 @@ buckets: {
       dimensions: "pool:luci.flex.try"
       # We have 32bit test configurations but some of our toolchain is 64bit (like CIPD)
       dimensions: "cpu:x86-64"
+      caches {
+        path: "win_toolchain"
+        name: "win_toolchain"
+      }
       recipe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
@@ -273,7 +269,6 @@ buckets: {
     builders {
       name: "linux-clang-dbg-x64"
       mixins: "linux"
-      mixins: "clang"
       mixins: "debug"
       mixins: "x64"
     }
@@ -281,7 +276,6 @@ buckets: {
     builders {
       name: "linux-clang-dbg-x86"
       mixins: "linux"
-      mixins: "clang"
       mixins: "debug"
       mixins: "x86"
     }
@@ -289,7 +283,6 @@ buckets: {
     builders {
       name: "linux-clang-rel-x64"
       mixins: "linux"
-      mixins: "clang"
       mixins: "release"
       mixins: "x64"
     }
@@ -297,7 +290,6 @@ buckets: {
     builders {
       name: "linux-clang-rel-x86"
       mixins: "linux"
-      mixins: "clang"
       mixins: "release"
       mixins: "x86"
     }
@@ -306,17 +298,13 @@ buckets: {
     builders {
       name: "mac-dbg"
       mixins: "mac"
-      mixins: "clang"
       mixins: "debug"
-      mixins: "x64"
     }
     # Actually on the CQ
     builders {
       name: "mac-rel"
       mixins: "mac"
-      mixins: "clang"
       mixins: "release"
-      mixins: "x64"
     }
 
     # Actually on the CQ
diff --git a/infra/config/global/luci-milo.cfg b/infra/config/global/luci-milo.cfg
index 2036d0e407..7f5a18fef8 100644
--- a/infra/config/global/luci-milo.cfg
+++ b/infra/config/global/luci-milo.cfg
@@ -1,111 +1,102 @@
-consoles: <
+consoles {
   id: "ci"
   name: "Tint CI Builders"
-  manifest_name: "REVISION"
   repo_url: "https://dawn.googlesource.com/tint"
-  refs: "regexp:refs/heads/main"
-  builders: <
+  refs: "refs/heads/main"
+  manifest_name: "REVISION"
+
+  builders {
     name: "buildbucket/luci.tint.ci/linux-clang-dbg-x64"
     category: "linux|clang|dbg"
     short_name: "x64"
-  >
-  builders: <
-    name: "buildbucket/luci.tint.ci/linux-clang-rel-x64"
-    category: "linux|clang|rel"
-    short_name: "x64"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.tint.ci/linux-clang-dbg-x86"
     category: "linux|clang|dbg"
     short_name: "x86"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.tint.ci/linux-clang-rel-x64"
+    category: "linux|clang|rel"
+    short_name: "x64"
+  }
+  builders {
     name: "buildbucket/luci.tint.ci/linux-clang-rel-x86"
     category: "linux|clang|rel"
     short_name: "x86"
-  >
-  builders: <
+  }
+
+  builders {
     name: "buildbucket/luci.tint.ci/mac-dbg"
     category: "mac"
     short_name: "dbg"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.tint.ci/mac-rel"
     category: "mac"
     short_name: "rel"
-  >
-  builders: <
+  }
+
+  builders {
     name: "buildbucket/luci.tint.ci/win-clang-dbg-x64"
     category: "win|clang|dbg"
     short_name: "x64"
-  >
-  builders: <
-    name: "buildbucket/luci.tint.ci/win-clang-rel-x64"
-    category: "win|clang|rel"
-    short_name: "x64"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.tint.ci/win-clang-dbg-x86"
     category: "win|clang|dbg"
     short_name: "x86"
-  >
-  builders: <
+  }
+  builders {
+    name: "buildbucket/luci.tint.ci/win-clang-rel-x64"
+    category: "win|clang|rel"
+    short_name: "x64"
+  }
+  builders {
     name: "buildbucket/luci.tint.ci/win-clang-rel-x86"
     category: "win|clang|rel"
     short_name: "x86"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.tint.ci/win-msvc-dbg-x64"
     category: "win|msvc"
     short_name: "dbg"
-  >
-  builders: <
+  }
+  builders {
     name: "buildbucket/luci.tint.ci/win-msvc-rel-x64"
     category: "win|msvc"
     short_name: "rel"
-  >
->
-consoles: <
+  }
+}
+
+consoles {
   id: "try"
   name: "Tint try Builders"
-  builders: <
-    name: "buildbucket/luci.tint.try/presubmit"
-  >
-  builders: <
-    name: "buildbucket/luci.tint.try/linux-clang-dbg-x64"
-  >
-  builders: <
-    name: "buildbucket/luci.tint.try/linux-clang-rel-x64"
-  >
-  builders: <
-    name: "buildbucket/luci.tint.try/linux-clang-dbg-x86"
-  >
-  builders: <
-    name: "buildbucket/luci.tint.try/linux-clang-rel-x86"
-  >
-  builders: <
-    name: "buildbucket/luci.tint.try/mac-dbg"
-  >
-  builders: <
-    name: "buildbucket/luci.tint.try/mac-rel"
-  >
-  builders: <
-    name: "buildbucket/luci.tint.try/win-clang-dbg-x64"
-  >
-  builders: <
-    name: "buildbucket/luci.tint.try/win-clang-rel-x64"
-  >
-  builders: <
-    name: "buildbucket/luci.tint.try/win-clang-dbg-x86"
-  >
-  builders: <
-    name: "buildbucket/luci.tint.try/win-clang-rel-x86"
-  >
-  builders: <
-    name: "buildbucket/luci.tint.try/win-msvc-dbg-x64"
-  >
-  builders: <
-    name: "buildbucket/luci.tint.try/win-msvc-rel-x64"
-  >
+  manifest_name: "PATCHED"
   builder_view_only: true
->
+
+  builders {
+    name: "buildbucket/luci.tint.try/presubmit"
+  }
+
+  builders {
+    name: "buildbucket/luci.tint.try/linux-clang-dbg-x64"
+  }
+  builders {
+    name: "buildbucket/luci.tint.try/linux-clang-rel-x64"
+  }
+
+  builders {
+    name: "buildbucket/luci.tint.try/mac-dbg"
+  }
+  builders {
+    name: "buildbucket/luci.tint.try/mac-rel"
+  }
+
+  builders {
+    name: "buildbucket/luci.tint.try/win-clang-dbg-x64"
+  }
+  builders {
+    name: "buildbucket/luci.tint.try/win-clang-rel-x64"
+  }
+}
diff --git a/infra/config/global/luci-scheduler.cfg b/infra/config/global/luci-scheduler.cfg
index 5c9dd7c8ef..f8bddcbec5 100644
--- a/infra/config/global/luci-scheduler.cfg
+++ b/infra/config/global/luci-scheduler.cfg
@@ -18,7 +18,7 @@ acl_sets {
 }
 
 trigger {
-  id: "primary-poller"
+  id: "master-gitiles-trigger"
   acl_sets: "default"
   gitiles {
     repo: "https://dawn.googlesource.com/tint.git"