diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 555c7953b..128eb2bd2 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -79,7 +79,6 @@ buckets {
       execution_timeout_secs: 10800  # 3h
       swarming_tags: "vpython:native-python-wrapper"
       build_numbers: YES
-      luci_migration_host: "luci-migration.appspot.com"
       recipe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
@@ -257,7 +256,6 @@ buckets {
       execution_timeout_secs: 10800  # 3h
       swarming_tags: "vpython:native-python-wrapper"
       build_numbers: YES
-      luci_migration_host: "luci-migration.appspot.com"
       recipe {
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
@@ -269,6 +267,9 @@ buckets {
     builders {
       name: "android"
       mixins: "android"
+      recipe {
+        properties_j: "$build/goma:{\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true}"
+      }
     }
     builders {
       name: "android_arm64"