diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index aa7a5f28..e4bcc021 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -4090,7 +4090,7 @@ buckets {
     builders {
       name: "go1.22-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -9385,7 +9385,7 @@ buckets {
     builders {
       name: "go1.23-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -14921,7 +14921,7 @@ buckets {
     builders {
       name: "gotip-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -18039,7 +18039,7 @@ buckets {
     builders {
       name: "x_arch-go1.22-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -20647,7 +20647,7 @@ buckets {
     builders {
       name: "x_arch-go1.23-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -23309,7 +23309,7 @@ buckets {
     builders {
       name: "x_arch-gotip-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -26022,7 +26022,7 @@ buckets {
     builders {
       name: "x_benchmarks-go1.22-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -28630,7 +28630,7 @@ buckets {
     builders {
       name: "x_benchmarks-go1.23-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -31292,7 +31292,7 @@ buckets {
     builders {
       name: "x_benchmarks-gotip-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -36414,7 +36414,7 @@ buckets {
     builders {
       name: "x_crypto-go1.22-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -39022,7 +39022,7 @@ buckets {
     builders {
       name: "x_crypto-go1.23-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -41684,7 +41684,7 @@ buckets {
     builders {
       name: "x_crypto-gotip-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -44397,7 +44397,7 @@ buckets {
     builders {
       name: "x_debug-go1.22-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -47005,7 +47005,7 @@ buckets {
     builders {
       name: "x_debug-go1.23-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -49667,7 +49667,7 @@ buckets {
     builders {
       name: "x_debug-gotip-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -58293,7 +58293,7 @@ buckets {
     builders {
       name: "x_image-go1.22-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -60901,7 +60901,7 @@ buckets {
     builders {
       name: "x_image-go1.23-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -63563,7 +63563,7 @@ buckets {
     builders {
       name: "x_image-gotip-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -67242,7 +67242,7 @@ buckets {
     builders {
       name: "x_mod-go1.22-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -69850,7 +69850,7 @@ buckets {
     builders {
       name: "x_mod-go1.23-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -72512,7 +72512,7 @@ buckets {
     builders {
       name: "x_mod-gotip-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -75225,7 +75225,7 @@ buckets {
     builders {
       name: "x_net-go1.22-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -77833,7 +77833,7 @@ buckets {
     builders {
       name: "x_net-go1.23-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -80495,7 +80495,7 @@ buckets {
     builders {
       name: "x_net-gotip-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -83208,7 +83208,7 @@ buckets {
     builders {
       name: "x_oauth2-go1.22-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -85816,7 +85816,7 @@ buckets {
     builders {
       name: "x_oauth2-go1.23-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -88478,7 +88478,7 @@ buckets {
     builders {
       name: "x_oauth2-gotip-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -106266,7 +106266,7 @@ buckets {
     builders {
       name: "x_sync-go1.22-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -108874,7 +108874,7 @@ buckets {
     builders {
       name: "x_sync-go1.23-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -111536,7 +111536,7 @@ buckets {
     builders {
       name: "x_sync-gotip-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -114249,7 +114249,7 @@ buckets {
     builders {
       name: "x_sys-go1.22-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -116857,7 +116857,7 @@ buckets {
     builders {
       name: "x_sys-go1.23-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -119519,7 +119519,7 @@ buckets {
     builders {
       name: "x_sys-gotip-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -122232,7 +122232,7 @@ buckets {
     builders {
       name: "x_telemetry-go1.22-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -124840,7 +124840,7 @@ buckets {
     builders {
       name: "x_telemetry-go1.23-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -127502,7 +127502,7 @@ buckets {
     builders {
       name: "x_telemetry-gotip-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -130215,7 +130215,7 @@ buckets {
     builders {
       name: "x_term-go1.22-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -132823,7 +132823,7 @@ buckets {
     builders {
       name: "x_term-go1.23-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -135485,7 +135485,7 @@ buckets {
     builders {
       name: "x_term-gotip-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -138198,7 +138198,7 @@ buckets {
     builders {
       name: "x_text-go1.22-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -140806,7 +140806,7 @@ buckets {
     builders {
       name: "x_text-go1.23-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -143468,7 +143468,7 @@ buckets {
     builders {
       name: "x_text-gotip-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -146181,7 +146181,7 @@ buckets {
     builders {
       name: "x_time-go1.22-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -148789,7 +148789,7 @@ buckets {
     builders {
       name: "x_time-go1.23-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -151451,7 +151451,7 @@ buckets {
     builders {
       name: "x_time-gotip-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -154216,7 +154216,7 @@ buckets {
     builders {
       name: "x_tools-go1.22-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -156932,7 +156932,7 @@ buckets {
     builders {
       name: "x_tools-go1.23-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -159757,7 +159757,7 @@ buckets {
     builders {
       name: "x_tools-gotip-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -172106,7 +172106,7 @@ buckets {
     builders {
       name: "z_dl-go1.22-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -174714,7 +174714,7 @@ buckets {
     builders {
       name: "z_dl-go1.23-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -177376,7 +177376,7 @@ buckets {
     builders {
       name: "z_dl-gotip-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -232398,7 +232398,7 @@ buckets {
     builders {
       name: "go1.22-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -237399,7 +237399,7 @@ buckets {
     builders {
       name: "go1.23-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -242631,7 +242631,7 @@ buckets {
     builders {
       name: "gotip-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -245608,7 +245608,7 @@ buckets {
     builders {
       name: "x_arch-go1.22-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -248216,7 +248216,7 @@ buckets {
     builders {
       name: "x_arch-go1.23-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -250878,7 +250878,7 @@ buckets {
     builders {
       name: "x_arch-gotip-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -253591,7 +253591,7 @@ buckets {
     builders {
       name: "x_benchmarks-go1.22-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -256199,7 +256199,7 @@ buckets {
     builders {
       name: "x_benchmarks-go1.23-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -258861,7 +258861,7 @@ buckets {
     builders {
       name: "x_benchmarks-gotip-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -261467,7 +261467,7 @@ buckets {
     builders {
       name: "x_build-go1.22-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -263968,7 +263968,7 @@ buckets {
     builders {
       name: "x_build-go1.23-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -266523,7 +266523,7 @@ buckets {
     builders {
       name: "x_build-gotip-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -269236,7 +269236,7 @@ buckets {
     builders {
       name: "x_crypto-go1.22-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -271844,7 +271844,7 @@ buckets {
     builders {
       name: "x_crypto-go1.23-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -274506,7 +274506,7 @@ buckets {
     builders {
       name: "x_crypto-gotip-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -277219,7 +277219,7 @@ buckets {
     builders {
       name: "x_debug-go1.22-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -279827,7 +279827,7 @@ buckets {
     builders {
       name: "x_debug-go1.23-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -282489,7 +282489,7 @@ buckets {
     builders {
       name: "x_debug-gotip-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -285095,7 +285095,7 @@ buckets {
     builders {
       name: "x_example-go1.22-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -287596,7 +287596,7 @@ buckets {
     builders {
       name: "x_example-go1.23-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -290151,7 +290151,7 @@ buckets {
     builders {
       name: "x_example-gotip-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -292757,7 +292757,7 @@ buckets {
     builders {
       name: "x_exp-go1.22-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -295258,7 +295258,7 @@ buckets {
     builders {
       name: "x_exp-go1.23-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -297813,7 +297813,7 @@ buckets {
     builders {
       name: "x_exp-gotip-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -300526,7 +300526,7 @@ buckets {
     builders {
       name: "x_image-go1.22-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -303134,7 +303134,7 @@ buckets {
     builders {
       name: "x_image-go1.23-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -305796,7 +305796,7 @@ buckets {
     builders {
       name: "x_image-gotip-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -308402,7 +308402,7 @@ buckets {
     builders {
       name: "x_mobile-go1.22-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -310903,7 +310903,7 @@ buckets {
     builders {
       name: "x_mobile-go1.23-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -313458,7 +313458,7 @@ buckets {
     builders {
       name: "x_mobile-gotip-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -316171,7 +316171,7 @@ buckets {
     builders {
       name: "x_mod-go1.22-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -318779,7 +318779,7 @@ buckets {
     builders {
       name: "x_mod-go1.23-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -321441,7 +321441,7 @@ buckets {
     builders {
       name: "x_mod-gotip-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -324154,7 +324154,7 @@ buckets {
     builders {
       name: "x_net-go1.22-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -326762,7 +326762,7 @@ buckets {
     builders {
       name: "x_net-go1.23-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -329424,7 +329424,7 @@ buckets {
     builders {
       name: "x_net-gotip-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -332137,7 +332137,7 @@ buckets {
     builders {
       name: "x_oauth2-go1.22-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -334745,7 +334745,7 @@ buckets {
     builders {
       name: "x_oauth2-go1.23-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -337407,7 +337407,7 @@ buckets {
     builders {
       name: "x_oauth2-gotip-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -339905,7 +339905,7 @@ buckets {
     builders {
       name: "x_oscar-go1.23-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -342403,7 +342403,7 @@ buckets {
     builders {
       name: "x_oscar-gotip-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -345009,7 +345009,7 @@ buckets {
     builders {
       name: "x_perf-go1.22-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -347510,7 +347510,7 @@ buckets {
     builders {
       name: "x_perf-go1.23-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -350065,7 +350065,7 @@ buckets {
     builders {
       name: "x_perf-gotip-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -352620,7 +352620,7 @@ buckets {
     builders {
       name: "x_pkgsite-go1.23-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -355175,7 +355175,7 @@ buckets {
     builders {
       name: "x_pkgsite-gotip-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -357781,7 +357781,7 @@ buckets {
     builders {
       name: "x_pkgsite-metrics-go1.22-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -360282,7 +360282,7 @@ buckets {
     builders {
       name: "x_pkgsite-metrics-go1.23-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -362837,7 +362837,7 @@ buckets {
     builders {
       name: "x_pkgsite-metrics-gotip-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -365443,7 +365443,7 @@ buckets {
     builders {
       name: "x_playground-go1.22-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -367944,7 +367944,7 @@ buckets {
     builders {
       name: "x_playground-go1.23-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -370499,7 +370499,7 @@ buckets {
     builders {
       name: "x_playground-gotip-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -373105,7 +373105,7 @@ buckets {
     builders {
       name: "x_review-go1.22-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -375606,7 +375606,7 @@ buckets {
     builders {
       name: "x_review-go1.23-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -378161,7 +378161,7 @@ buckets {
     builders {
       name: "x_review-gotip-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -380767,7 +380767,7 @@ buckets {
     builders {
       name: "x_scratch-go1.22-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -383268,7 +383268,7 @@ buckets {
     builders {
       name: "x_scratch-go1.23-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -385823,7 +385823,7 @@ buckets {
     builders {
       name: "x_scratch-gotip-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -388536,7 +388536,7 @@ buckets {
     builders {
       name: "x_sync-go1.22-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -391144,7 +391144,7 @@ buckets {
     builders {
       name: "x_sync-go1.23-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -393806,7 +393806,7 @@ buckets {
     builders {
       name: "x_sync-gotip-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -396519,7 +396519,7 @@ buckets {
     builders {
       name: "x_sys-go1.22-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -399127,7 +399127,7 @@ buckets {
     builders {
       name: "x_sys-go1.23-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -401789,7 +401789,7 @@ buckets {
     builders {
       name: "x_sys-gotip-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -404502,7 +404502,7 @@ buckets {
     builders {
       name: "x_telemetry-go1.22-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -407110,7 +407110,7 @@ buckets {
     builders {
       name: "x_telemetry-go1.23-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -409772,7 +409772,7 @@ buckets {
     builders {
       name: "x_telemetry-gotip-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -412485,7 +412485,7 @@ buckets {
     builders {
       name: "x_term-go1.22-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -415093,7 +415093,7 @@ buckets {
     builders {
       name: "x_term-go1.23-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -417755,7 +417755,7 @@ buckets {
     builders {
       name: "x_term-gotip-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -420468,7 +420468,7 @@ buckets {
     builders {
       name: "x_text-go1.22-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -423076,7 +423076,7 @@ buckets {
     builders {
       name: "x_text-go1.23-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -425738,7 +425738,7 @@ buckets {
     builders {
       name: "x_text-gotip-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -428451,7 +428451,7 @@ buckets {
     builders {
       name: "x_time-go1.22-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -431059,7 +431059,7 @@ buckets {
     builders {
       name: "x_time-go1.23-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -433721,7 +433721,7 @@ buckets {
     builders {
       name: "x_time-gotip-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -436759,7 +436759,7 @@ buckets {
     builders {
       name: "x_tools-go1.22-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -439695,7 +439695,7 @@ buckets {
     builders {
       name: "x_tools-go1.23-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -442740,7 +442740,7 @@ buckets {
     builders {
       name: "x_tools-gotip-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -445346,7 +445346,7 @@ buckets {
     builders {
       name: "x_vuln-go1.22-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -447847,7 +447847,7 @@ buckets {
     builders {
       name: "x_vuln-go1.23-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -450402,7 +450402,7 @@ buckets {
     builders {
       name: "x_vuln-gotip-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -453008,7 +453008,7 @@ buckets {
     builders {
       name: "x_vulndb-go1.22-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -455509,7 +455509,7 @@ buckets {
     builders {
       name: "x_vulndb-go1.23-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -458064,7 +458064,7 @@ buckets {
     builders {
       name: "x_vulndb-gotip-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -460670,7 +460670,7 @@ buckets {
     builders {
       name: "x_website-go1.22-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -463171,7 +463171,7 @@ buckets {
     builders {
       name: "x_website-go1.23-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -465726,7 +465726,7 @@ buckets {
     builders {
       name: "x_website-gotip-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -468332,7 +468332,7 @@ buckets {
     builders {
       name: "x_xerrors-go1.22-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -470833,7 +470833,7 @@ buckets {
     builders {
       name: "x_xerrors-go1.23-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -473388,7 +473388,7 @@ buckets {
     builders {
       name: "x_xerrors-gotip-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -476101,7 +476101,7 @@ buckets {
     builders {
       name: "z_dl-go1.22-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -478709,7 +478709,7 @@ buckets {
     builders {
       name: "z_dl-go1.23-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -481371,7 +481371,7 @@ buckets {
     builders {
       name: "z_dl-gotip-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -483979,7 +483979,7 @@ buckets {
     builders {
       name: "z_protobuf-go1.22-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -486482,7 +486482,7 @@ buckets {
     builders {
       name: "z_protobuf-go1.23-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
@@ -489039,7 +489039,7 @@ buckets {
     builders {
       name: "z_protobuf-gotip-netbsd-arm"
       swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cipd_platform:netbsd-armv6l"
+      dimensions: "cipd_platform:netbsd-armv7l"
       dimensions: "pool:luci.golang.shared-workers"
       exe {
         cipd_package: "infra/experimental/golangbuild/${platform}"
diff --git a/main.star b/main.star
index f0f9df69..4569513f 100755
--- a/main.star
+++ b/main.star
@@ -1263,7 +1263,8 @@ def dimensions_of(host_type):
     if goos == "darwin":
         cipd_platform = "mac-" + goarch  # GOHOSTOS=darwin is written as "mac".
     elif goarch == "arm":
-        cipd_platform = goos + "-armv6l"  # GOHOSTARCH=arm is written as "armv6l".
+        suffix = "v7l" if goos == "netbsd" else "v6l"
+        cipd_platform = goos + "-arm" + suffix  # GOHOSTARCH=arm is written as "arm{suffix}".
     else:
         cipd_platform = host