diff --git a/infra/config/global/generated/cr-buildbucket.cfg b/infra/config/global/generated/cr-buildbucket.cfg
index 4075897..c9f5cee 100644
--- a/infra/config/global/generated/cr-buildbucket.cfg
+++ b/infra/config/global/generated/cr-buildbucket.cfg
@@ -21,7 +21,7 @@
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/main"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-untrusted\",\"jobs\":250,\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}"
+        properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-trusted\",\"jobs\":250,\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}"
         properties_j: "clang:true"
         properties_j: "debug:false"
         properties_j: "gen_fuzz_corpus:true"
@@ -40,7 +40,7 @@
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/main"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-untrusted\",\"jobs\":250,\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}"
+        properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-trusted\",\"jobs\":250,\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}"
         properties_j: "clang:true"
         properties_j: "debug:true"
         properties_j: "target_cpu:\"x64\""
@@ -58,7 +58,7 @@
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/main"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-untrusted\",\"jobs\":250,\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}"
+        properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-trusted\",\"jobs\":250,\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}"
         properties_j: "clang:true"
         properties_j: "debug:true"
         properties_j: "target_cpu:\"x86\""
@@ -76,7 +76,7 @@
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/main"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-untrusted\",\"jobs\":250,\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}"
+        properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-trusted\",\"jobs\":250,\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}"
         properties_j: "clang:true"
         properties_j: "debug:false"
         properties_j: "target_cpu:\"x64\""
@@ -94,7 +94,7 @@
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/main"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-untrusted\",\"jobs\":250,\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}"
+        properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-trusted\",\"jobs\":250,\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}"
         properties_j: "clang:true"
         properties_j: "debug:false"
         properties_j: "target_cpu:\"x86\""
@@ -112,7 +112,7 @@
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/main"
         properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-untrusted\",\"jobs\":250,\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}"
+        properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-trusted\",\"jobs\":250,\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}"
         properties_j: "clang:true"
         properties_j: "debug:true"
         properties_j: "target_cpu:\"x64\""
@@ -134,7 +134,7 @@
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/main"
         properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-untrusted\",\"jobs\":250,\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}"
+        properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-trusted\",\"jobs\":250,\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}"
         properties_j: "clang:true"
         properties_j: "debug:false"
         properties_j: "target_cpu:\"x64\""
@@ -156,7 +156,7 @@
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/main"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-untrusted\",\"jobs\":250,\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}"
+        properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-trusted\",\"jobs\":250,\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}"
         properties_j: "clang:true"
         properties_j: "debug:true"
         properties_j: "target_cpu:\"x64\""
@@ -178,7 +178,7 @@
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/main"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-untrusted\",\"jobs\":250,\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}"
+        properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-trusted\",\"jobs\":250,\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}"
         properties_j: "clang:true"
         properties_j: "debug:true"
         properties_j: "target_cpu:\"x86\""
@@ -200,7 +200,7 @@
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/main"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-untrusted\",\"jobs\":250,\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}"
+        properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-trusted\",\"jobs\":250,\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}"
         properties_j: "clang:true"
         properties_j: "debug:false"
         properties_j: "target_cpu:\"x64\""
@@ -222,7 +222,7 @@
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/main"
         properties_j: "$build/goma:{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-untrusted\",\"jobs\":250,\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}"
+        properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-trusted\",\"jobs\":250,\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}"
         properties_j: "clang:true"
         properties_j: "debug:false"
         properties_j: "target_cpu:\"x86\""
diff --git a/infra/config/global/main.star b/infra/config/global/main.star
index 0c5cc73..c91ff52 100755
--- a/infra/config/global/main.star
+++ b/infra/config/global/main.star
@@ -117,6 +117,7 @@
 
 reclient = struct(
     instance = struct(
+        DEFAULT_TRUSTED = "rbe-chromium-trusted",
         DEFAULT_UNTRUSTED = "rbe-chromium-untrusted",
     ),
     jobs = struct(
@@ -206,7 +207,7 @@
 
     return dimensions
 
-def get_default_properties(os, clang, debug, cpu, fuzzer, reclient_jobs):
+def get_default_properties(os, clang, debug, cpu, fuzzer, reclient_instance, reclient_jobs):
     """Get the properties for a builder that don't depend on being CI vs Try
 
     Args:
@@ -242,7 +243,7 @@
         properties["$build/goma"] = goma_props
 
         reclient_props = {
-            "instance": reclient.instance.DEFAULT_UNTRUSTED,
+            "instance": reclient_instance,
             "jobs": reclient_jobs,
             "metrics_project": "chromium-reclient-metrics",
             "scandeps_server": True
@@ -264,7 +265,9 @@
     """
     dimensions_ci = get_default_dimensions(os)
     dimensions_ci["pool"] = "luci.flex.ci"
-    properties_ci = get_default_properties(os, clang, debug, cpu, fuzzer, reclient.jobs.HIGH_JOBS_FOR_CI)
+    properties_ci = get_default_properties(os, clang, debug, cpu, fuzzer,
+                                           reclient.instance.DEFAULT_TRUSTED,
+                                           reclient.jobs.HIGH_JOBS_FOR_CI)
     schedule_ci = None
     if fuzzer:
         schedule_ci = "0 0 0 * * * *"
@@ -296,7 +299,9 @@
     """
     dimensions_try = get_default_dimensions(os)
     dimensions_try["pool"] = "luci.flex.try"
-    properties_try = get_default_properties(os, clang, debug, cpu, fuzzer, reclient.jobs.LOW_JOBS_FOR_CQ)
+    properties_try = get_default_properties(os, clang, debug, cpu, fuzzer,
+                                            reclient.instance.DEFAULT_UNTRUSTED,
+                                            reclient.jobs.LOW_JOBS_FOR_CQ)
     properties_try["$depot_tools/bot_update"] = {
         "apply_patch_on_gclient": True,
     }