diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 788a709c67..47caa2e550 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -1568,7 +1568,7 @@ buckets {
     builders {
       name: "go1.20-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -1577,7 +1577,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.20",'
@@ -1605,10 +1605,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -4186,7 +4182,7 @@ buckets {
     builders {
       name: "go1.21-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -4195,7 +4191,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.21",'
@@ -4223,10 +4219,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -6999,7 +6991,7 @@ buckets {
     builders {
       name: "go1.22-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -7008,7 +7000,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.22",'
@@ -7036,10 +7028,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -9766,7 +9754,7 @@ buckets {
     builders {
       name: "gotip-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -9775,7 +9763,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "master",'
@@ -9803,10 +9791,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -11852,7 +11836,7 @@ buckets {
     builders {
       name: "x_arch-go1.20-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -11861,7 +11845,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.20",'
@@ -11889,10 +11873,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -13642,7 +13622,7 @@ buckets {
     builders {
       name: "x_arch-go1.21-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -13651,7 +13631,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.21",'
@@ -13679,10 +13659,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -15530,7 +15506,7 @@ buckets {
     builders {
       name: "x_arch-go1.22-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -15539,7 +15515,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.22",'
@@ -15567,10 +15543,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -17372,7 +17344,7 @@ buckets {
     builders {
       name: "x_arch-gotip-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -17381,7 +17353,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "master",'
@@ -17409,10 +17381,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -19260,7 +19228,7 @@ buckets {
     builders {
       name: "x_benchmarks-go1.20-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -19269,7 +19237,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.20",'
@@ -19297,10 +19265,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -21050,7 +21014,7 @@ buckets {
     builders {
       name: "x_benchmarks-go1.21-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -21059,7 +21023,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.21",'
@@ -21087,10 +21051,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -22938,7 +22898,7 @@ buckets {
     builders {
       name: "x_benchmarks-go1.22-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -22947,7 +22907,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.22",'
@@ -22975,10 +22935,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -24780,7 +24736,7 @@ buckets {
     builders {
       name: "x_benchmarks-gotip-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -24789,7 +24745,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "master",'
@@ -24817,10 +24773,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -28731,7 +28683,7 @@ buckets {
     builders {
       name: "x_crypto-go1.20-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -28740,7 +28692,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.20",'
@@ -28768,10 +28720,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -30521,7 +30469,7 @@ buckets {
     builders {
       name: "x_crypto-go1.21-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -30530,7 +30478,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.21",'
@@ -30558,10 +30506,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -32409,7 +32353,7 @@ buckets {
     builders {
       name: "x_crypto-go1.22-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -32418,7 +32362,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.22",'
@@ -32446,10 +32390,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -34251,7 +34191,7 @@ buckets {
     builders {
       name: "x_crypto-gotip-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -34260,7 +34200,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "master",'
@@ -34288,10 +34228,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -36139,7 +36075,7 @@ buckets {
     builders {
       name: "x_debug-go1.20-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -36148,7 +36084,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.20",'
@@ -36176,10 +36112,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -37929,7 +37861,7 @@ buckets {
     builders {
       name: "x_debug-go1.21-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -37938,7 +37870,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.21",'
@@ -37966,10 +37898,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -39817,7 +39745,7 @@ buckets {
     builders {
       name: "x_debug-go1.22-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -39826,7 +39754,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.22",'
@@ -39854,10 +39782,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -41659,7 +41583,7 @@ buckets {
     builders {
       name: "x_debug-gotip-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -41668,7 +41592,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "master",'
@@ -41696,10 +41620,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -47045,7 +46965,7 @@ buckets {
     builders {
       name: "x_image-go1.20-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -47054,7 +46974,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.20",'
@@ -47082,10 +47002,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -48835,7 +48751,7 @@ buckets {
     builders {
       name: "x_image-go1.21-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -48844,7 +48760,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.21",'
@@ -48872,10 +48788,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -50723,7 +50635,7 @@ buckets {
     builders {
       name: "x_image-go1.22-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -50732,7 +50644,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.22",'
@@ -50760,10 +50672,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -52565,7 +52473,7 @@ buckets {
     builders {
       name: "x_image-gotip-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -52574,7 +52482,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "master",'
@@ -52602,10 +52510,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -55609,7 +55513,7 @@ buckets {
     builders {
       name: "x_mod-go1.20-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -55618,7 +55522,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.20",'
@@ -55646,10 +55550,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -57399,7 +57299,7 @@ buckets {
     builders {
       name: "x_mod-go1.21-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -57408,7 +57308,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.21",'
@@ -57436,10 +57336,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -59287,7 +59183,7 @@ buckets {
     builders {
       name: "x_mod-go1.22-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -59296,7 +59192,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.22",'
@@ -59324,10 +59220,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -61129,7 +61021,7 @@ buckets {
     builders {
       name: "x_mod-gotip-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -61138,7 +61030,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "master",'
@@ -61166,10 +61058,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -63017,7 +62905,7 @@ buckets {
     builders {
       name: "x_net-go1.20-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -63026,7 +62914,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.20",'
@@ -63054,10 +62942,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -64807,7 +64691,7 @@ buckets {
     builders {
       name: "x_net-go1.21-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -64816,7 +64700,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.21",'
@@ -64844,10 +64728,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -66695,7 +66575,7 @@ buckets {
     builders {
       name: "x_net-go1.22-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -66704,7 +66584,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.22",'
@@ -66732,10 +66612,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -68537,7 +68413,7 @@ buckets {
     builders {
       name: "x_net-gotip-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -68546,7 +68422,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "master",'
@@ -68574,10 +68450,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -70425,7 +70297,7 @@ buckets {
     builders {
       name: "x_oauth2-go1.20-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -70434,7 +70306,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.20",'
@@ -70462,10 +70334,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -72215,7 +72083,7 @@ buckets {
     builders {
       name: "x_oauth2-go1.21-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -72224,7 +72092,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.21",'
@@ -72252,10 +72120,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -74103,7 +73967,7 @@ buckets {
     builders {
       name: "x_oauth2-go1.22-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -74112,7 +73976,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.22",'
@@ -74140,10 +74004,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -75945,7 +75805,7 @@ buckets {
     builders {
       name: "x_oauth2-gotip-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -75954,7 +75814,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "master",'
@@ -75982,10 +75842,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -88897,7 +88753,7 @@ buckets {
     builders {
       name: "x_sync-go1.20-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -88906,7 +88762,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.20",'
@@ -88934,10 +88790,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -90687,7 +90539,7 @@ buckets {
     builders {
       name: "x_sync-go1.21-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -90696,7 +90548,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.21",'
@@ -90724,10 +90576,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -92575,7 +92423,7 @@ buckets {
     builders {
       name: "x_sync-go1.22-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -92584,7 +92432,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.22",'
@@ -92612,10 +92460,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -94417,7 +94261,7 @@ buckets {
     builders {
       name: "x_sync-gotip-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -94426,7 +94270,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "master",'
@@ -94454,10 +94298,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -96305,7 +96145,7 @@ buckets {
     builders {
       name: "x_sys-go1.20-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -96314,7 +96154,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.20",'
@@ -96342,10 +96182,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -98095,7 +97931,7 @@ buckets {
     builders {
       name: "x_sys-go1.21-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -98104,7 +97940,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.21",'
@@ -98132,10 +97968,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -99983,7 +99815,7 @@ buckets {
     builders {
       name: "x_sys-go1.22-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -99992,7 +99824,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.22",'
@@ -100020,10 +99852,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -101825,7 +101653,7 @@ buckets {
     builders {
       name: "x_sys-gotip-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -101834,7 +101662,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "master",'
@@ -101862,10 +101690,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -106479,7 +106303,7 @@ buckets {
     builders {
       name: "x_term-go1.20-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -106488,7 +106312,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.20",'
@@ -106516,10 +106340,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -108269,7 +108089,7 @@ buckets {
     builders {
       name: "x_term-go1.21-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -108278,7 +108098,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.21",'
@@ -108306,10 +108126,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -110157,7 +109973,7 @@ buckets {
     builders {
       name: "x_term-go1.22-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -110166,7 +109982,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.22",'
@@ -110194,10 +110010,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -111999,7 +111811,7 @@ buckets {
     builders {
       name: "x_term-gotip-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -112008,7 +111820,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "master",'
@@ -112036,10 +111848,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -113887,7 +113695,7 @@ buckets {
     builders {
       name: "x_text-go1.20-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -113896,7 +113704,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.20",'
@@ -113924,10 +113732,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -115677,7 +115481,7 @@ buckets {
     builders {
       name: "x_text-go1.21-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -115686,7 +115490,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.21",'
@@ -115714,10 +115518,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -117565,7 +117365,7 @@ buckets {
     builders {
       name: "x_text-go1.22-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -117574,7 +117374,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.22",'
@@ -117602,10 +117402,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -119407,7 +119203,7 @@ buckets {
     builders {
       name: "x_text-gotip-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -119416,7 +119212,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "master",'
@@ -119444,10 +119240,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -121295,7 +121087,7 @@ buckets {
     builders {
       name: "x_time-go1.20-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -121304,7 +121096,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.20",'
@@ -121332,10 +121124,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -123085,7 +122873,7 @@ buckets {
     builders {
       name: "x_time-go1.21-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -123094,7 +122882,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.21",'
@@ -123122,10 +122910,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -124973,7 +124757,7 @@ buckets {
     builders {
       name: "x_time-go1.22-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -124982,7 +124766,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.22",'
@@ -125010,10 +124794,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -126815,7 +126595,7 @@ buckets {
     builders {
       name: "x_time-gotip-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -126824,7 +126604,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "master",'
@@ -126852,10 +126632,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -128797,7 +128573,7 @@ buckets {
     builders {
       name: "x_tools-go1.20-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -128806,7 +128582,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.20",'
@@ -128834,10 +128610,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -130587,7 +130359,7 @@ buckets {
     builders {
       name: "x_tools-go1.21-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -130596,7 +130368,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.21",'
@@ -130624,10 +130396,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -132475,7 +132243,7 @@ buckets {
     builders {
       name: "x_tools-go1.22-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -132484,7 +132252,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.22",'
@@ -132512,10 +132280,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -134317,7 +134081,7 @@ buckets {
     builders {
       name: "x_tools-gotip-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -134326,7 +134090,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "master",'
@@ -134354,10 +134118,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -144503,7 +144263,7 @@ buckets {
     builders {
       name: "z_dl-go1.20-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -144512,7 +144272,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.20",'
@@ -144540,10 +144300,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -146293,7 +146049,7 @@ buckets {
     builders {
       name: "z_dl-go1.21-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -146302,7 +146058,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.21",'
@@ -146330,10 +146086,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -148181,7 +147933,7 @@ buckets {
     builders {
       name: "z_dl-go1.22-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -148190,7 +147942,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.22",'
@@ -148218,10 +147970,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -150023,7 +149771,7 @@ buckets {
     builders {
       name: "z_dl-gotip-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -150032,7 +149780,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "master",'
@@ -150060,10 +149808,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -185500,7 +185244,7 @@ buckets {
     builders {
       name: "go1.20-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -185509,7 +185253,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.20",'
@@ -185537,10 +185281,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -187875,7 +187615,7 @@ buckets {
     builders {
       name: "go1.21-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -187884,7 +187624,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.21",'
@@ -187912,10 +187652,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -190410,7 +190146,7 @@ buckets {
     builders {
       name: "go1.22-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -190419,7 +190155,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.22",'
@@ -190447,10 +190183,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -192899,7 +192631,7 @@ buckets {
     builders {
       name: "gotip-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -192908,7 +192640,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "master",'
@@ -192936,10 +192668,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -194846,7 +194574,7 @@ buckets {
     builders {
       name: "x_arch-go1.20-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -194855,7 +194583,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.20",'
@@ -194883,10 +194611,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -196636,7 +196360,7 @@ buckets {
     builders {
       name: "x_arch-go1.21-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -196645,7 +196369,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.21",'
@@ -196673,10 +196397,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -198524,7 +198244,7 @@ buckets {
     builders {
       name: "x_arch-go1.22-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -198533,7 +198253,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.22",'
@@ -198561,10 +198281,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -200366,7 +200082,7 @@ buckets {
     builders {
       name: "x_arch-gotip-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -200375,7 +200091,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "master",'
@@ -200403,10 +200119,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -202254,7 +201966,7 @@ buckets {
     builders {
       name: "x_benchmarks-go1.20-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -202263,7 +201975,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.20",'
@@ -202291,10 +202003,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -204044,7 +203752,7 @@ buckets {
     builders {
       name: "x_benchmarks-go1.21-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -204053,7 +203761,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.21",'
@@ -204081,10 +203789,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -205932,7 +205636,7 @@ buckets {
     builders {
       name: "x_benchmarks-go1.22-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -205941,7 +205645,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.22",'
@@ -205969,10 +205673,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -207774,7 +207474,7 @@ buckets {
     builders {
       name: "x_benchmarks-gotip-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -207783,7 +207483,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "master",'
@@ -207811,10 +207511,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -209662,7 +209358,7 @@ buckets {
     builders {
       name: "x_build-go1.21-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -209671,7 +209367,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.21",'
@@ -209699,10 +209395,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -211550,7 +211242,7 @@ buckets {
     builders {
       name: "x_build-go1.22-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -211559,7 +211251,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.22",'
@@ -211587,10 +211279,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -213392,7 +213080,7 @@ buckets {
     builders {
       name: "x_build-gotip-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -213401,7 +213089,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "master",'
@@ -213429,10 +213117,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -215280,7 +214964,7 @@ buckets {
     builders {
       name: "x_crypto-go1.20-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -215289,7 +214973,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.20",'
@@ -215317,10 +215001,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -217070,7 +216750,7 @@ buckets {
     builders {
       name: "x_crypto-go1.21-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -217079,7 +216759,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.21",'
@@ -217107,10 +216787,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -218958,7 +218634,7 @@ buckets {
     builders {
       name: "x_crypto-go1.22-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -218967,7 +218643,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.22",'
@@ -218995,10 +218671,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -220800,7 +220472,7 @@ buckets {
     builders {
       name: "x_crypto-gotip-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -220809,7 +220481,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "master",'
@@ -220837,10 +220509,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -222688,7 +222356,7 @@ buckets {
     builders {
       name: "x_debug-go1.20-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -222697,7 +222365,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.20",'
@@ -222725,10 +222393,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -224478,7 +224142,7 @@ buckets {
     builders {
       name: "x_debug-go1.21-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -224487,7 +224151,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.21",'
@@ -224515,10 +224179,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -226366,7 +226026,7 @@ buckets {
     builders {
       name: "x_debug-go1.22-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -226375,7 +226035,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.22",'
@@ -226403,10 +226063,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -228208,7 +227864,7 @@ buckets {
     builders {
       name: "x_debug-gotip-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -228217,7 +227873,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "master",'
@@ -228245,10 +227901,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -230096,7 +229748,7 @@ buckets {
     builders {
       name: "x_exp-go1.20-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -230105,7 +229757,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.20",'
@@ -230133,10 +229785,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -231886,7 +231534,7 @@ buckets {
     builders {
       name: "x_exp-go1.21-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -231895,7 +231543,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.21",'
@@ -231923,10 +231571,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -233774,7 +233418,7 @@ buckets {
     builders {
       name: "x_exp-go1.22-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -233783,7 +233427,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.22",'
@@ -233811,10 +233455,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -235616,7 +235256,7 @@ buckets {
     builders {
       name: "x_exp-gotip-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -235625,7 +235265,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "master",'
@@ -235653,10 +235293,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -237504,7 +237140,7 @@ buckets {
     builders {
       name: "x_image-go1.20-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -237513,7 +237149,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.20",'
@@ -237541,10 +237177,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -239294,7 +238926,7 @@ buckets {
     builders {
       name: "x_image-go1.21-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -239303,7 +238935,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.21",'
@@ -239331,10 +238963,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -241182,7 +240810,7 @@ buckets {
     builders {
       name: "x_image-go1.22-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -241191,7 +240819,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.22",'
@@ -241219,10 +240847,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -243024,7 +242648,7 @@ buckets {
     builders {
       name: "x_image-gotip-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -243033,7 +242657,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "master",'
@@ -243061,10 +242685,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -244912,7 +244532,7 @@ buckets {
     builders {
       name: "x_mobile-go1.20-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -244921,7 +244541,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.20",'
@@ -244949,10 +244569,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -246702,7 +246318,7 @@ buckets {
     builders {
       name: "x_mobile-go1.21-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -246711,7 +246327,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.21",'
@@ -246739,10 +246355,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -248590,7 +248202,7 @@ buckets {
     builders {
       name: "x_mobile-go1.22-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -248599,7 +248211,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.22",'
@@ -248627,10 +248239,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -250432,7 +250040,7 @@ buckets {
     builders {
       name: "x_mobile-gotip-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -250441,7 +250049,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "master",'
@@ -250469,10 +250077,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -252320,7 +251924,7 @@ buckets {
     builders {
       name: "x_mod-go1.20-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -252329,7 +251933,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.20",'
@@ -252357,10 +251961,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -254110,7 +253710,7 @@ buckets {
     builders {
       name: "x_mod-go1.21-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -254119,7 +253719,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.21",'
@@ -254147,10 +253747,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -255998,7 +255594,7 @@ buckets {
     builders {
       name: "x_mod-go1.22-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -256007,7 +255603,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.22",'
@@ -256035,10 +255631,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -257840,7 +257432,7 @@ buckets {
     builders {
       name: "x_mod-gotip-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -257849,7 +257441,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "master",'
@@ -257877,10 +257469,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -259728,7 +259316,7 @@ buckets {
     builders {
       name: "x_net-go1.20-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -259737,7 +259325,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.20",'
@@ -259765,10 +259353,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -261518,7 +261102,7 @@ buckets {
     builders {
       name: "x_net-go1.21-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -261527,7 +261111,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.21",'
@@ -261555,10 +261139,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -263406,7 +262986,7 @@ buckets {
     builders {
       name: "x_net-go1.22-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -263415,7 +262995,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.22",'
@@ -263443,10 +263023,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -265248,7 +264824,7 @@ buckets {
     builders {
       name: "x_net-gotip-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -265257,7 +264833,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "master",'
@@ -265285,10 +264861,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -267136,7 +266708,7 @@ buckets {
     builders {
       name: "x_oauth2-go1.20-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -267145,7 +266717,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.20",'
@@ -267173,10 +266745,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -268926,7 +268494,7 @@ buckets {
     builders {
       name: "x_oauth2-go1.21-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -268935,7 +268503,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.21",'
@@ -268963,10 +268531,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -270814,7 +270378,7 @@ buckets {
     builders {
       name: "x_oauth2-go1.22-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -270823,7 +270387,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.22",'
@@ -270851,10 +270415,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -272656,7 +272216,7 @@ buckets {
     builders {
       name: "x_oauth2-gotip-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -272665,7 +272225,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "master",'
@@ -272693,10 +272253,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -274544,7 +274100,7 @@ buckets {
     builders {
       name: "x_perf-go1.20-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -274553,7 +274109,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.20",'
@@ -274581,10 +274137,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -276334,7 +275886,7 @@ buckets {
     builders {
       name: "x_perf-go1.21-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -276343,7 +275895,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.21",'
@@ -276371,10 +275923,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -278222,7 +277770,7 @@ buckets {
     builders {
       name: "x_perf-go1.22-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -278231,7 +277779,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.22",'
@@ -278259,10 +277807,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -280064,7 +279608,7 @@ buckets {
     builders {
       name: "x_perf-gotip-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -280073,7 +279617,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "master",'
@@ -280101,10 +279645,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -281952,7 +281492,7 @@ buckets {
     builders {
       name: "x_pkgsite-go1.20-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -281961,7 +281501,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.20",'
@@ -281989,10 +281529,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -283742,7 +283278,7 @@ buckets {
     builders {
       name: "x_pkgsite-go1.21-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -283751,7 +283287,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.21",'
@@ -283779,10 +283315,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -285630,7 +285162,7 @@ buckets {
     builders {
       name: "x_pkgsite-go1.22-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -285639,7 +285171,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.22",'
@@ -285667,10 +285199,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -287472,7 +287000,7 @@ buckets {
     builders {
       name: "x_pkgsite-gotip-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -287481,7 +287009,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "master",'
@@ -287509,10 +287037,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -289360,7 +288884,7 @@ buckets {
     builders {
       name: "x_pkgsite-metrics-go1.20-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -289369,7 +288893,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.20",'
@@ -289397,10 +288921,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -291150,7 +290670,7 @@ buckets {
     builders {
       name: "x_pkgsite-metrics-go1.21-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -291159,7 +290679,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.21",'
@@ -291187,10 +290707,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -293038,7 +292554,7 @@ buckets {
     builders {
       name: "x_pkgsite-metrics-go1.22-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -293047,7 +292563,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.22",'
@@ -293075,10 +292591,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -294880,7 +294392,7 @@ buckets {
     builders {
       name: "x_pkgsite-metrics-gotip-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -294889,7 +294401,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "master",'
@@ -294917,10 +294429,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -296768,7 +296276,7 @@ buckets {
     builders {
       name: "x_review-go1.20-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -296777,7 +296285,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.20",'
@@ -296805,10 +296313,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -298558,7 +298062,7 @@ buckets {
     builders {
       name: "x_review-go1.21-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -298567,7 +298071,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.21",'
@@ -298595,10 +298099,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -300446,7 +299946,7 @@ buckets {
     builders {
       name: "x_review-go1.22-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -300455,7 +299955,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.22",'
@@ -300483,10 +299983,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -302288,7 +301784,7 @@ buckets {
     builders {
       name: "x_review-gotip-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -302297,7 +301793,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "master",'
@@ -302325,10 +301821,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -304176,7 +303668,7 @@ buckets {
     builders {
       name: "x_sync-go1.20-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -304185,7 +303677,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.20",'
@@ -304213,10 +303705,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -305966,7 +305454,7 @@ buckets {
     builders {
       name: "x_sync-go1.21-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -305975,7 +305463,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.21",'
@@ -306003,10 +305491,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -307854,7 +307338,7 @@ buckets {
     builders {
       name: "x_sync-go1.22-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -307863,7 +307347,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.22",'
@@ -307891,10 +307375,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -309696,7 +309176,7 @@ buckets {
     builders {
       name: "x_sync-gotip-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -309705,7 +309185,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "master",'
@@ -309733,10 +309213,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -311584,7 +311060,7 @@ buckets {
     builders {
       name: "x_sys-go1.20-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -311593,7 +311069,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.20",'
@@ -311621,10 +311097,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -313374,7 +312846,7 @@ buckets {
     builders {
       name: "x_sys-go1.21-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -313383,7 +312855,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.21",'
@@ -313411,10 +312883,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -315262,7 +314730,7 @@ buckets {
     builders {
       name: "x_sys-go1.22-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -315271,7 +314739,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.22",'
@@ -315299,10 +314767,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -317104,7 +316568,7 @@ buckets {
     builders {
       name: "x_sys-gotip-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -317113,7 +316577,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "master",'
@@ -317141,10 +316605,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -318992,7 +318452,7 @@ buckets {
     builders {
       name: "x_telemetry-go1.20-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -319001,7 +318461,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.20",'
@@ -319029,10 +318489,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -320782,7 +320238,7 @@ buckets {
     builders {
       name: "x_telemetry-go1.21-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -320791,7 +320247,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.21",'
@@ -320819,10 +320275,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -322670,7 +322122,7 @@ buckets {
     builders {
       name: "x_telemetry-go1.22-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -322679,7 +322131,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.22",'
@@ -322707,10 +322159,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -324512,7 +323960,7 @@ buckets {
     builders {
       name: "x_telemetry-gotip-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -324521,7 +323969,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "master",'
@@ -324549,10 +323997,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -326400,7 +325844,7 @@ buckets {
     builders {
       name: "x_term-go1.20-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -326409,7 +325853,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.20",'
@@ -326437,10 +325881,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -328190,7 +327630,7 @@ buckets {
     builders {
       name: "x_term-go1.21-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -328199,7 +327639,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.21",'
@@ -328227,10 +327667,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -330078,7 +329514,7 @@ buckets {
     builders {
       name: "x_term-go1.22-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -330087,7 +329523,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.22",'
@@ -330115,10 +329551,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -331920,7 +331352,7 @@ buckets {
     builders {
       name: "x_term-gotip-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -331929,7 +331361,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "master",'
@@ -331957,10 +331389,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -333808,7 +333236,7 @@ buckets {
     builders {
       name: "x_text-go1.20-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -333817,7 +333245,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.20",'
@@ -333845,10 +333273,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -335598,7 +335022,7 @@ buckets {
     builders {
       name: "x_text-go1.21-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -335607,7 +335031,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.21",'
@@ -335635,10 +335059,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -337486,7 +336906,7 @@ buckets {
     builders {
       name: "x_text-go1.22-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -337495,7 +336915,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.22",'
@@ -337523,10 +336943,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -339328,7 +338744,7 @@ buckets {
     builders {
       name: "x_text-gotip-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -339337,7 +338753,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "master",'
@@ -339365,10 +338781,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -341216,7 +340628,7 @@ buckets {
     builders {
       name: "x_time-go1.20-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -341225,7 +340637,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.20",'
@@ -341253,10 +340665,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -343006,7 +342414,7 @@ buckets {
     builders {
       name: "x_time-go1.21-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -343015,7 +342423,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.21",'
@@ -343043,10 +342451,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -344894,7 +344298,7 @@ buckets {
     builders {
       name: "x_time-go1.22-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -344903,7 +344307,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.22",'
@@ -344931,10 +344335,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -346736,7 +346136,7 @@ buckets {
     builders {
       name: "x_time-gotip-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -346745,7 +346145,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "master",'
@@ -346773,10 +346173,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -348718,7 +348114,7 @@ buckets {
     builders {
       name: "x_tools-go1.20-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -348727,7 +348123,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.20",'
@@ -348755,10 +348151,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -350508,7 +349900,7 @@ buckets {
     builders {
       name: "x_tools-go1.21-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -350517,7 +349909,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.21",'
@@ -350545,10 +349937,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -352396,7 +351784,7 @@ buckets {
     builders {
       name: "x_tools-go1.22-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -352405,7 +351793,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.22",'
@@ -352433,10 +351821,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -354238,7 +353622,7 @@ buckets {
     builders {
       name: "x_tools-gotip-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -354247,7 +353631,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "master",'
@@ -354275,10 +353659,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -356126,7 +355506,7 @@ buckets {
     builders {
       name: "x_vuln-go1.20-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -356135,7 +355515,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.20",'
@@ -356163,10 +355543,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -357916,7 +357292,7 @@ buckets {
     builders {
       name: "x_vuln-go1.21-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -357925,7 +357301,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.21",'
@@ -357953,10 +357329,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -359804,7 +359176,7 @@ buckets {
     builders {
       name: "x_vuln-go1.22-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -359813,7 +359185,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.22",'
@@ -359841,10 +359213,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -361646,7 +361014,7 @@ buckets {
     builders {
       name: "x_vuln-gotip-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -361655,7 +361023,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "master",'
@@ -361683,10 +361051,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -363534,7 +362898,7 @@ buckets {
     builders {
       name: "x_vulndb-go1.20-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -363543,7 +362907,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.20",'
@@ -363571,10 +362935,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -365324,7 +364684,7 @@ buckets {
     builders {
       name: "x_vulndb-go1.21-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -365333,7 +364693,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.21",'
@@ -365361,10 +364721,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -367212,7 +366568,7 @@ buckets {
     builders {
       name: "x_vulndb-go1.22-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -367221,7 +366577,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.22",'
@@ -367249,10 +366605,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -369054,7 +368406,7 @@ buckets {
     builders {
       name: "x_vulndb-gotip-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -369063,7 +368415,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "master",'
@@ -369091,10 +368443,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -370942,7 +370290,7 @@ buckets {
     builders {
       name: "x_website-go1.20-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -370951,7 +370299,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.20",'
@@ -370979,10 +370327,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -372732,7 +372076,7 @@ buckets {
     builders {
       name: "x_website-go1.21-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -372741,7 +372085,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.21",'
@@ -372769,10 +372113,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -374620,7 +373960,7 @@ buckets {
     builders {
       name: "x_website-go1.22-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -374629,7 +373969,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.22",'
@@ -374657,10 +373997,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -376462,7 +375798,7 @@ buckets {
     builders {
       name: "x_website-gotip-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -376471,7 +375807,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "master",'
@@ -376499,10 +375835,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -378350,7 +377682,7 @@ buckets {
     builders {
       name: "z_dl-go1.20-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -378359,7 +377691,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.20",'
@@ -378387,10 +377719,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -380140,7 +379468,7 @@ buckets {
     builders {
       name: "z_dl-go1.21-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -380149,7 +379477,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.21",'
@@ -380177,10 +379505,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -382028,7 +381352,7 @@ buckets {
     builders {
       name: "z_dl-go1.22-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -382037,7 +381361,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.22",'
@@ -382065,10 +381389,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -383870,7 +383190,7 @@ buckets {
     builders {
       name: "z_dl-gotip-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -383879,7 +383199,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "master",'
@@ -383907,10 +383227,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -385760,7 +385076,7 @@ buckets {
     builders {
       name: "z_protobuf-go1.20-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -385769,7 +385085,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.20",'
@@ -385797,10 +385113,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -387552,7 +386864,7 @@ buckets {
     builders {
       name: "z_protobuf-go1.21-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -387561,7 +386873,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.17.13",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.21",'
@@ -387589,10 +386901,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -389442,7 +388750,7 @@ buckets {
     builders {
       name: "z_protobuf-go1.22-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -389451,7 +388759,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "release-branch.go1.22",'
@@ -389479,10 +388787,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
@@ -391286,7 +390590,7 @@ buckets {
     builders {
       name: "z_protobuf-gotip-linux-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:linux-armv6l"
+      dimensions: "cipd_platform:linux-arm64"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -391295,7 +390599,7 @@ buckets {
       }
       properties:
         '{'
-        '  "bootstrap_version": "1.21.0",'
+        '  "bootstrap_version": "1.20.6",'
         '  "env": {},'
         '  "git_cache": "git",'
         '  "go_branch": "master",'
@@ -391323,10 +390627,6 @@ buckets {
         path: "tools"
       }
       service_account: "public-worker-builder@golang-ci-luci.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.best_effort_platform"
-        value: 100
-      }
       resultdb {
         enable: true
       }
diff --git a/main.star b/main.star
index 2d2d5ae3ca..7c937d5334 100755
--- a/main.star
+++ b/main.star
@@ -805,6 +805,23 @@ def dimensions_of(host_type):
     else:
         cipd_platform = host
 
+    # We run some arm ports on arm64 machines.
+    #
+    # This is done late in dimensions_of to handle that linux-arm64 instances on AWS can
+    # test the linux/arm port, but linux-arm64 instances on GCE cannot at this time, yet
+    # the Swarming Bot reports the same cipd_platform value of 'linux-arm64' in both cases.
+    # This approach takes advantage of the linux-arm builder being low-capacity at this time,
+    # while the linux-arm64 builder is definitely not low-capacity, causing their pool dimension
+    # to be different and letting the linux-{arm,arm64} builder definitions filter appropriately.
+    # (In addition to their pool dimension being different, there are more dimensions like machine_type
+    # that might also differ, but the pool dimension difference is more stable and deemed load-bearing.)
+    #
+    # TODO(dmitshur): This and the similar case for 386 on amd64 can be handled closer together and
+    # in a more formal way, but that is likely blocked on us getting more fine grained control to
+    # reported dimensions without each individual one requiring a Swarming Bot change and deploy.
+    if goarch == "arm" and goos in ("linux"):
+        cipd_platform = "linux-arm64"
+
     dims = {"cipd_platform": cipd_platform}
     if os != None:
         dims["os"] = os
@@ -826,6 +843,12 @@ def is_fully_supported(dims):
     Args:
         dims: The dimensions of a task/bot.
     """
+
+    # Note that the linux-arm builder currently runs on a linux-arm64 host
+    # (i.e., its cipd_platform value is linux-arm64), which results in it
+    # being marked as fully supported, which is unusual for low-capacity
+    # builders but doesn't cause problems for linux-arm.
+
     supported = ["%s-%s" % (os, arch) for os in ["linux", "mac", "windows"] for arch in ["amd64", "arm64"]]
     return dims["cipd_platform"] in supported