diff --git a/infra/config/global/cr-buildbucket.cfg b/infra/config/global/cr-buildbucket.cfg
index 65c64544a7..5e1c49d644 100644
--- a/infra/config/global/cr-buildbucket.cfg
+++ b/infra/config/global/cr-buildbucket.cfg
@@ -85,7 +85,7 @@ builder_mixins {
 }
 builder_mixins {
   name: "windows",
-  dimensions: "os:Windows"
+  dimensions: "os:Windows-10"
   recipe {
     properties_j: <<EOF
       $build/goma: {
@@ -204,17 +204,17 @@ buckets {
       mixins: "x86"
     }
     # GOMA doesn't support MSVC builds so we don't used the "windows" mixin and
-    # instead list the dimensions: "os:Windows" directly.
+    # instead list the dimensions: "os:Windows-10" directly.
     builders {
       name: "win-msvc-dbg-x64"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       mixins: "no_clang"
       mixins: "debug"
       mixins: "x64"
     }
     builders {
       name: "win-msvc-rel-x64"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       mixins: "no_clang"
       mixins: "release"
       mixins: "x64"
@@ -335,11 +335,11 @@ buckets: {
       mixins: "x86"
     }
     # GOMA doesn't support MSVC builds so we don't used the "windows" mixin and
-    # instead list the dimensions: "os:Windows" directly.
+    # instead list the dimensions: "os:Windows-10" directly.
     # CI Mirror only
     builders {
       name: "win-msvc-dbg-x64"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       mixins: "no_clang"
       mixins: "debug"
       mixins: "x64"
@@ -347,7 +347,7 @@ buckets: {
     # CI Mirror only
     builders {
       name: "win-msvc-rel-x64"
-      dimensions: "os:Windows"
+      dimensions: "os:Windows-10"
       mixins: "no_clang"
       mixins: "release"
       mixins: "x64"