diff --git a/infra/config/global/generated/cr-buildbucket.cfg b/infra/config/global/generated/cr-buildbucket.cfg
index ee7cd56..1813b38 100644
--- a/infra/config/global/generated/cr-buildbucket.cfg
+++ b/infra/config/global/generated/cr-buildbucket.cfg
@@ -20,7 +20,6 @@
         name: "tint"
         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-trusted\",\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}"
         properties_j: "clang:true"
         properties_j: "debug:true"
@@ -42,7 +41,6 @@
         name: "tint"
         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-trusted\",\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}"
         properties_j: "clang:true"
         properties_j: "debug:true"
@@ -64,7 +62,6 @@
         name: "tint"
         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-trusted\",\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}"
         properties_j: "clang:true"
         properties_j: "debug:false"
@@ -86,7 +83,6 @@
         name: "tint"
         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-trusted\",\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}"
         properties_j: "clang:true"
         properties_j: "debug:false"
@@ -108,7 +104,6 @@
         name: "tint"
         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-trusted\",\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}"
         properties_j: "clang:true"
         properties_j: "debug:true"
@@ -134,7 +129,6 @@
         name: "tint"
         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-trusted\",\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}"
         properties_j: "clang:true"
         properties_j: "debug:false"
@@ -160,7 +154,6 @@
         name: "tint"
         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-trusted\",\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}"
         properties_j: "clang:true"
         properties_j: "debug:true"
@@ -186,7 +179,6 @@
         name: "tint"
         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-trusted\",\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}"
         properties_j: "clang:true"
         properties_j: "debug:true"
@@ -212,7 +204,6 @@
         name: "tint"
         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-trusted\",\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}"
         properties_j: "clang:true"
         properties_j: "debug:false"
@@ -238,7 +229,6 @@
         name: "tint"
         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-trusted\",\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}"
         properties_j: "clang:true"
         properties_j: "debug:false"
@@ -322,7 +312,6 @@
         name: "tint"
         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\",\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}"
         properties_j: "$depot_tools/bot_update:{\"apply_patch_on_gclient\":true}"
         properties_j: "clang:true"
@@ -345,7 +334,6 @@
         name: "tint"
         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\",\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}"
         properties_j: "$depot_tools/bot_update:{\"apply_patch_on_gclient\":true}"
         properties_j: "clang:true"
@@ -368,7 +356,6 @@
         name: "tint"
         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\",\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}"
         properties_j: "$depot_tools/bot_update:{\"apply_patch_on_gclient\":true}"
         properties_j: "clang:true"
@@ -391,7 +378,6 @@
         name: "tint"
         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\",\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}"
         properties_j: "$depot_tools/bot_update:{\"apply_patch_on_gclient\":true}"
         properties_j: "clang:true"
@@ -414,7 +400,6 @@
         name: "tint"
         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\",\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}"
         properties_j: "$depot_tools/bot_update:{\"apply_patch_on_gclient\":true}"
         properties_j: "clang:true"
@@ -441,7 +426,6 @@
         name: "tint"
         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\",\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}"
         properties_j: "$depot_tools/bot_update:{\"apply_patch_on_gclient\":true}"
         properties_j: "clang:true"
@@ -488,7 +472,6 @@
         name: "tint"
         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\",\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}"
         properties_j: "$depot_tools/bot_update:{\"apply_patch_on_gclient\":true}"
         properties_j: "clang:true"
@@ -515,7 +498,6 @@
         name: "tint"
         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\",\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}"
         properties_j: "$depot_tools/bot_update:{\"apply_patch_on_gclient\":true}"
         properties_j: "clang:true"
@@ -542,7 +524,6 @@
         name: "tint"
         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\",\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}"
         properties_j: "$depot_tools/bot_update:{\"apply_patch_on_gclient\":true}"
         properties_j: "clang:true"
@@ -569,7 +550,6 @@
         name: "tint"
         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\",\"metrics_project\":\"chromium-reclient-metrics\",\"scandeps_server\":true}"
         properties_j: "$depot_tools/bot_update:{\"apply_patch_on_gclient\":true}"
         properties_j: "clang:true"
diff --git a/infra/config/global/main.star b/infra/config/global/main.star
index 8c541c1..b69ed92 100755
--- a/infra/config/global/main.star
+++ b/infra/config/global/main.star
@@ -190,18 +190,6 @@
     properties["target_cpu"] = cpu
 
     properties["clang"] = clang
-    msvc = os.category == os_category.WINDOWS and not clang
-
-    if msvc != True:
-        goma_props = {}
-        goma_props.update({
-            "server_host": "goma.chromium.org",
-            "rpc_extra_params": "?prod",
-            "use_luci_auth": True,
-        })
-        if os.category != os_category.MAC:
-            goma_props["enable_ats"] = True
-        properties["$build/goma"] = goma_props
 
     return properties