diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 036f95f1d..0baf0b0c1 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -31,7 +31,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "mastername:\"client.libyuv\""
+        properties_j: "builder_group:\"client.libyuv\""
       }
       execution_timeout_secs: 10800
       build_numbers: YES
@@ -50,7 +50,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "mastername:\"client.libyuv\""
+        properties_j: "builder_group:\"client.libyuv\""
       }
       execution_timeout_secs: 10800
       build_numbers: YES
@@ -69,7 +69,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "mastername:\"client.libyuv\""
+        properties_j: "builder_group:\"client.libyuv\""
       }
       execution_timeout_secs: 10800
       build_numbers: YES
@@ -86,7 +86,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "mastername:\"client.libyuv\""
+        properties_j: "builder_group:\"client.libyuv\""
       }
       execution_timeout_secs: 10800
       build_numbers: YES
@@ -103,7 +103,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "mastername:\"client.libyuv\""
+        properties_j: "builder_group:\"client.libyuv\""
       }
       execution_timeout_secs: 10800
       build_numbers: YES
@@ -120,7 +120,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "mastername:\"client.libyuv\""
+        properties_j: "builder_group:\"client.libyuv\""
       }
       execution_timeout_secs: 10800
       build_numbers: YES
@@ -139,7 +139,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "mastername:\"client.libyuv\""
+        properties_j: "builder_group:\"client.libyuv\""
       }
       execution_timeout_secs: 10800
       build_numbers: YES
@@ -158,7 +158,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "mastername:\"client.libyuv\""
+        properties_j: "builder_group:\"client.libyuv\""
       }
       execution_timeout_secs: 10800
       build_numbers: YES
@@ -177,7 +177,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "mastername:\"client.libyuv\""
+        properties_j: "builder_group:\"client.libyuv\""
       }
       execution_timeout_secs: 10800
       build_numbers: YES
@@ -196,7 +196,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "mastername:\"client.libyuv\""
+        properties_j: "builder_group:\"client.libyuv\""
       }
       execution_timeout_secs: 10800
       build_numbers: YES
@@ -215,7 +215,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "mastername:\"client.libyuv\""
+        properties_j: "builder_group:\"client.libyuv\""
       }
       execution_timeout_secs: 10800
       build_numbers: YES
@@ -234,7 +234,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "mastername:\"client.libyuv\""
+        properties_j: "builder_group:\"client.libyuv\""
       }
       execution_timeout_secs: 10800
       build_numbers: YES
@@ -253,7 +253,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "mastername:\"client.libyuv\""
+        properties_j: "builder_group:\"client.libyuv\""
       }
       execution_timeout_secs: 10800
       build_numbers: YES
@@ -272,7 +272,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "mastername:\"client.libyuv\""
+        properties_j: "builder_group:\"client.libyuv\""
       }
       execution_timeout_secs: 10800
       build_numbers: YES
@@ -291,7 +291,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "mastername:\"client.libyuv\""
+        properties_j: "builder_group:\"client.libyuv\""
       }
       execution_timeout_secs: 10800
       build_numbers: YES
@@ -310,7 +310,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "mastername:\"client.libyuv\""
+        properties_j: "builder_group:\"client.libyuv\""
       }
       execution_timeout_secs: 10800
       build_numbers: YES
@@ -329,7 +329,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "mastername:\"client.libyuv\""
+        properties_j: "builder_group:\"client.libyuv\""
       }
       execution_timeout_secs: 10800
       build_numbers: YES
@@ -347,7 +347,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "mastername:\"client.libyuv\""
+        properties_j: "builder_group:\"client.libyuv\""
       }
       execution_timeout_secs: 10800
       build_numbers: YES
@@ -365,7 +365,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "mastername:\"client.libyuv\""
+        properties_j: "builder_group:\"client.libyuv\""
       }
       execution_timeout_secs: 10800
       build_numbers: YES
@@ -383,7 +383,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "mastername:\"client.libyuv\""
+        properties_j: "builder_group:\"client.libyuv\""
       }
       execution_timeout_secs: 10800
       build_numbers: YES
@@ -402,7 +402,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "mastername:\"client.libyuv\""
+        properties_j: "builder_group:\"client.libyuv\""
       }
       execution_timeout_secs: 10800
       build_numbers: YES
@@ -421,7 +421,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "mastername:\"client.libyuv\""
+        properties_j: "builder_group:\"client.libyuv\""
       }
       execution_timeout_secs: 10800
       build_numbers: YES
@@ -440,7 +440,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "mastername:\"client.libyuv\""
+        properties_j: "builder_group:\"client.libyuv\""
       }
       execution_timeout_secs: 10800
       build_numbers: YES
@@ -459,7 +459,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "mastername:\"client.libyuv\""
+        properties_j: "builder_group:\"client.libyuv\""
       }
       execution_timeout_secs: 10800
       build_numbers: YES
@@ -478,7 +478,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "mastername:\"client.libyuv\""
+        properties_j: "builder_group:\"client.libyuv\""
       }
       execution_timeout_secs: 10800
       build_numbers: YES
@@ -497,7 +497,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "mastername:\"client.libyuv\""
+        properties_j: "builder_group:\"client.libyuv\""
       }
       execution_timeout_secs: 10800
       build_numbers: YES
@@ -516,7 +516,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "mastername:\"client.libyuv\""
+        properties_j: "builder_group:\"client.libyuv\""
       }
       execution_timeout_secs: 10800
       build_numbers: YES
@@ -535,7 +535,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "mastername:\"client.libyuv\""
+        properties_j: "builder_group:\"client.libyuv\""
       }
       execution_timeout_secs: 10800
       build_numbers: YES
@@ -553,7 +553,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "mastername:\"client.libyuv\""
+        properties_j: "builder_group:\"client.libyuv\""
       }
       execution_timeout_secs: 10800
       build_numbers: YES
@@ -571,7 +571,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "mastername:\"client.libyuv\""
+        properties_j: "builder_group:\"client.libyuv\""
       }
       execution_timeout_secs: 10800
       build_numbers: YES
@@ -589,7 +589,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "mastername:\"client.libyuv\""
+        properties_j: "builder_group:\"client.libyuv\""
       }
       execution_timeout_secs: 10800
       build_numbers: YES
@@ -607,7 +607,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "mastername:\"client.libyuv\""
+        properties_j: "builder_group:\"client.libyuv\""
       }
       execution_timeout_secs: 10800
       build_numbers: YES
@@ -676,7 +676,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "mastername:\"tryserver.libyuv\""
+        properties_j: "builder_group:\"tryserver.libyuv\""
       }
       execution_timeout_secs: 10800
       build_numbers: YES
@@ -693,7 +693,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "mastername:\"tryserver.libyuv\""
+        properties_j: "builder_group:\"tryserver.libyuv\""
       }
       execution_timeout_secs: 10800
       build_numbers: YES
@@ -710,7 +710,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "mastername:\"tryserver.libyuv\""
+        properties_j: "builder_group:\"tryserver.libyuv\""
       }
       execution_timeout_secs: 10800
       build_numbers: YES
@@ -729,7 +729,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "mastername:\"tryserver.libyuv\""
+        properties_j: "builder_group:\"tryserver.libyuv\""
       }
       execution_timeout_secs: 10800
       build_numbers: YES
@@ -748,7 +748,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "mastername:\"tryserver.libyuv\""
+        properties_j: "builder_group:\"tryserver.libyuv\""
       }
       execution_timeout_secs: 10800
       build_numbers: YES
@@ -766,7 +766,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "mastername:\"tryserver.libyuv\""
+        properties_j: "builder_group:\"tryserver.libyuv\""
       }
       execution_timeout_secs: 10800
       build_numbers: YES
@@ -784,7 +784,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "mastername:\"tryserver.libyuv\""
+        properties_j: "builder_group:\"tryserver.libyuv\""
       }
       execution_timeout_secs: 10800
       build_numbers: YES
@@ -802,7 +802,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "mastername:\"tryserver.libyuv\""
+        properties_j: "builder_group:\"tryserver.libyuv\""
       }
       execution_timeout_secs: 10800
       build_numbers: YES
@@ -820,7 +820,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "mastername:\"tryserver.libyuv\""
+        properties_j: "builder_group:\"tryserver.libyuv\""
       }
       execution_timeout_secs: 10800
       build_numbers: YES
@@ -839,7 +839,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "mastername:\"tryserver.libyuv\""
+        properties_j: "builder_group:\"tryserver.libyuv\""
       }
       execution_timeout_secs: 10800
       build_numbers: YES
@@ -858,7 +858,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "mastername:\"tryserver.libyuv\""
+        properties_j: "builder_group:\"tryserver.libyuv\""
       }
       execution_timeout_secs: 10800
       build_numbers: YES
@@ -877,7 +877,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "mastername:\"tryserver.libyuv\""
+        properties_j: "builder_group:\"tryserver.libyuv\""
       }
       execution_timeout_secs: 10800
       build_numbers: YES
@@ -896,7 +896,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "mastername:\"tryserver.libyuv\""
+        properties_j: "builder_group:\"tryserver.libyuv\""
       }
       execution_timeout_secs: 10800
       build_numbers: YES
@@ -915,7 +915,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "mastername:\"tryserver.libyuv\""
+        properties_j: "builder_group:\"tryserver.libyuv\""
       }
       execution_timeout_secs: 10800
       build_numbers: YES
@@ -934,7 +934,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "mastername:\"tryserver.libyuv\""
+        properties_j: "builder_group:\"tryserver.libyuv\""
       }
       execution_timeout_secs: 10800
       build_numbers: YES
@@ -953,7 +953,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "mastername:\"tryserver.libyuv\""
+        properties_j: "builder_group:\"tryserver.libyuv\""
       }
       execution_timeout_secs: 10800
       build_numbers: YES
@@ -972,7 +972,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "mastername:\"tryserver.libyuv\""
+        properties_j: "builder_group:\"tryserver.libyuv\""
       }
       execution_timeout_secs: 10800
       build_numbers: YES
@@ -990,7 +990,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "mastername:\"tryserver.libyuv\""
+        properties_j: "builder_group:\"tryserver.libyuv\""
       }
       execution_timeout_secs: 10800
       build_numbers: YES
@@ -1008,7 +1008,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "mastername:\"tryserver.libyuv\""
+        properties_j: "builder_group:\"tryserver.libyuv\""
       }
       execution_timeout_secs: 10800
       build_numbers: YES
@@ -1026,7 +1026,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "mastername:\"tryserver.libyuv\""
+        properties_j: "builder_group:\"tryserver.libyuv\""
       }
       execution_timeout_secs: 10800
       build_numbers: YES
@@ -1045,7 +1045,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "mastername:\"tryserver.libyuv\""
+        properties_j: "builder_group:\"tryserver.libyuv\""
         properties_j: "repo_name:\"libyuv\""
         properties_j: "runhooks:true"
       }
@@ -1066,7 +1066,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "mastername:\"tryserver.libyuv\""
+        properties_j: "builder_group:\"tryserver.libyuv\""
       }
       execution_timeout_secs: 10800
       build_numbers: YES
@@ -1085,7 +1085,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "mastername:\"tryserver.libyuv\""
+        properties_j: "builder_group:\"tryserver.libyuv\""
       }
       execution_timeout_secs: 10800
       build_numbers: YES
@@ -1104,7 +1104,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "mastername:\"tryserver.libyuv\""
+        properties_j: "builder_group:\"tryserver.libyuv\""
       }
       execution_timeout_secs: 10800
       build_numbers: YES
@@ -1123,7 +1123,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "mastername:\"tryserver.libyuv\""
+        properties_j: "builder_group:\"tryserver.libyuv\""
       }
       execution_timeout_secs: 10800
       build_numbers: YES
@@ -1142,7 +1142,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "mastername:\"tryserver.libyuv\""
+        properties_j: "builder_group:\"tryserver.libyuv\""
       }
       execution_timeout_secs: 10800
       build_numbers: YES
@@ -1161,7 +1161,7 @@ buckets {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$build/goma:{\"enable_ats\":true,\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
-        properties_j: "mastername:\"tryserver.libyuv\""
+        properties_j: "builder_group:\"tryserver.libyuv\""
       }
       execution_timeout_secs: 10800
       build_numbers: YES
diff --git a/main.star b/main.star
index 177645eb4..8d2b381b0 100755
--- a/main.star
+++ b/main.star
@@ -242,7 +242,7 @@ def ci_builder(name, os, category, short_name = None):
     properties = get_os_properties(os)
 
     dimensions["pool"] = "luci.flex.ci"
-    properties["mastername"] = "client.libyuv"
+    properties["builder_group"] = "client.libyuv"
 
     triggered_by = ["master-gitiles-trigger" if os != "android" else "Android Debug"]
     libyuv_ci_view(name, category, short_name)
@@ -253,7 +253,7 @@ def try_builder(name, os, experiment_percentage = None):
     properties = get_os_properties(os)
 
     dimensions["pool"] = "luci.flex.try"
-    properties["mastername"] = "tryserver.libyuv"
+    properties["builder_group"] = "tryserver.libyuv"
 
     if name == "presubmit":
         recipe_name = "run_presubmit"