diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index 13b93a8..eb4a894 100644
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -44,7 +44,7 @@
 	DEFAULT_OS_LINUX_GCE = "Debian-9.8"
 	DEFAULT_OS_MAC       = "Mac-10.13.6"
 	DEFAULT_OS_UBUNTU    = "Ubuntu-14.04"
-	DEFAULT_OS_WIN       = "Windows-2016Server-14393"
+	DEFAULT_OS_WIN       = "Windows-Server-14393"
 
 	DEFAULT_PROJECT = "skia"
 
@@ -452,7 +452,7 @@
 			"Ubuntu17":   "Ubuntu-17.04",
 			"Ubuntu18":   "Ubuntu-18.04",
 			"Win":        DEFAULT_OS_WIN,
-			"Win10":      "Windows-10-17763.557",
+			"Win10":      "Windows-10-18362",
 			"Win2k8":     "Windows-2008ServerR2-SP1",
 			"Win2016":    DEFAULT_OS_WIN,
 			"Win7":       "Windows-7-SP1",
@@ -463,8 +463,8 @@
 			glog.Fatalf("Entry %q not found in OS mapping.", os)
 		}
 		if os == "Win10" && parts["model"] == "Golo" {
-			// ChOps-owned machines have Windows 10 v1709, but a slightly different version than Skolo.
-			d["os"] = "Windows-10-16299.309"
+			// ChOps-owned machines have Windows 10 v1709.
+			d["os"] = "Windows-10-16299"
 		}
 		if d["os"] == DEFAULT_OS_WIN {
 			// TODO(dogben): Temporarily add image dimension during upgrade.
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 56bb32d..be0c67c 100755
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -15504,7 +15504,7 @@
         "gpu:none",
         "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-highcpu-64",
-        "os:Windows-2016Server-14393",
+        "os:Windows-Server-14393",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -15640,7 +15640,7 @@
         "gpu:none",
         "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-highcpu-64",
-        "os:Windows-2016Server-14393",
+        "os:Windows-Server-14393",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -15776,7 +15776,7 @@
         "gpu:none",
         "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-highcpu-64",
-        "os:Windows-2016Server-14393",
+        "os:Windows-Server-14393",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -15912,7 +15912,7 @@
         "gpu:none",
         "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-highcpu-64",
-        "os:Windows-2016Server-14393",
+        "os:Windows-Server-14393",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -16048,7 +16048,7 @@
         "gpu:none",
         "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-highcpu-64",
-        "os:Windows-2016Server-14393",
+        "os:Windows-Server-14393",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -16184,7 +16184,7 @@
         "gpu:none",
         "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-highcpu-64",
-        "os:Windows-2016Server-14393",
+        "os:Windows-Server-14393",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -16325,7 +16325,7 @@
         "gpu:none",
         "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-highcpu-64",
-        "os:Windows-2016Server-14393",
+        "os:Windows-Server-14393",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -16461,7 +16461,7 @@
         "gpu:none",
         "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-highcpu-64",
-        "os:Windows-2016Server-14393",
+        "os:Windows-Server-14393",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -16597,7 +16597,7 @@
         "gpu:none",
         "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-highcpu-64",
-        "os:Windows-2016Server-14393",
+        "os:Windows-Server-14393",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -16733,7 +16733,7 @@
         "gpu:none",
         "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-highcpu-64",
-        "os:Windows-2016Server-14393",
+        "os:Windows-Server-14393",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -16869,7 +16869,7 @@
         "gpu:none",
         "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-highcpu-64",
-        "os:Windows-2016Server-14393",
+        "os:Windows-Server-14393",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -17005,7 +17005,7 @@
         "gpu:none",
         "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-highcpu-64",
-        "os:Windows-2016Server-14393",
+        "os:Windows-Server-14393",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -17141,7 +17141,7 @@
         "gpu:none",
         "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-highcpu-64",
-        "os:Windows-2016Server-14393",
+        "os:Windows-Server-14393",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -17272,7 +17272,7 @@
         "gpu:none",
         "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-highcpu-64",
-        "os:Windows-2016Server-14393",
+        "os:Windows-Server-14393",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -17403,7 +17403,7 @@
         "gpu:none",
         "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-highcpu-64",
-        "os:Windows-2016Server-14393",
+        "os:Windows-Server-14393",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -17534,7 +17534,7 @@
         "gpu:none",
         "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-highcpu-64",
-        "os:Windows-2016Server-14393",
+        "os:Windows-Server-14393",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -17665,7 +17665,7 @@
         "gpu:none",
         "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-highcpu-64",
-        "os:Windows-2016Server-14393",
+        "os:Windows-Server-14393",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -17796,7 +17796,7 @@
         "gpu:none",
         "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-highcpu-64",
-        "os:Windows-2016Server-14393",
+        "os:Windows-Server-14393",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -17927,7 +17927,7 @@
         "gpu:none",
         "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-highcpu-64",
-        "os:Windows-2016Server-14393",
+        "os:Windows-Server-14393",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -18058,7 +18058,7 @@
         "gpu:none",
         "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-highcpu-64",
-        "os:Windows-2016Server-14393",
+        "os:Windows-Server-14393",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -18189,7 +18189,7 @@
         "gpu:none",
         "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-highcpu-64",
-        "os:Windows-2016Server-14393",
+        "os:Windows-Server-14393",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -34227,7 +34227,7 @@
       ],
       "dimensions": [
         "gpu:1002:6646-24.20.13001.1010",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -34343,7 +34343,7 @@
       ],
       "dimensions": [
         "gpu:1002:6646-24.20.13001.1010",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -34459,7 +34459,7 @@
       ],
       "dimensions": [
         "gpu:1002:6646-24.20.13001.1010",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -34575,7 +34575,7 @@
       ],
       "dimensions": [
         "gpu:1002:6646-24.20.13001.1010",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -34691,7 +34691,7 @@
       ],
       "dimensions": [
         "gpu:1002:6646-24.20.13001.1010",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -34807,7 +34807,7 @@
       ],
       "dimensions": [
         "gpu:1002:6646-24.20.13001.1010",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -34923,7 +34923,7 @@
       ],
       "dimensions": [
         "gpu:10de:104a-23.21.13.9101",
-        "os:Windows-10-16299.309",
+        "os:Windows-10-16299",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -35039,7 +35039,7 @@
       ],
       "dimensions": [
         "gpu:10de:104a-23.21.13.9101",
-        "os:Windows-10-16299.309",
+        "os:Windows-10-16299",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -35155,7 +35155,7 @@
       ],
       "dimensions": [
         "gpu:10de:104a-23.21.13.9101",
-        "os:Windows-10-16299.309",
+        "os:Windows-10-16299",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -35271,7 +35271,7 @@
       ],
       "dimensions": [
         "gpu:10de:104a-23.21.13.9101",
-        "os:Windows-10-16299.309",
+        "os:Windows-10-16299",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -35387,7 +35387,7 @@
       ],
       "dimensions": [
         "gpu:10de:1cb3-25.21.14.1678",
-        "os:Windows-10-16299.309",
+        "os:Windows-10-16299",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -35503,7 +35503,7 @@
       ],
       "dimensions": [
         "gpu:10de:1cb3-25.21.14.1678",
-        "os:Windows-10-16299.309",
+        "os:Windows-10-16299",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -35619,7 +35619,7 @@
       ],
       "dimensions": [
         "gpu:10de:1cb3-25.21.14.1678",
-        "os:Windows-10-16299.309",
+        "os:Windows-10-16299",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -35735,7 +35735,7 @@
       ],
       "dimensions": [
         "gpu:10de:1cb3-25.21.14.1678",
-        "os:Windows-10-16299.309",
+        "os:Windows-10-16299",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -35851,7 +35851,7 @@
       ],
       "dimensions": [
         "gpu:10de:1cb3-25.21.14.1678",
-        "os:Windows-10-16299.309",
+        "os:Windows-10-16299",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -35967,7 +35967,7 @@
       ],
       "dimensions": [
         "gpu:10de:1cb3-25.21.14.1678",
-        "os:Windows-10-16299.309",
+        "os:Windows-10-16299",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -36069,7 +36069,7 @@
       ],
       "dimensions": [
         "gpu:10de:1cb3-25.21.14.1678",
-        "os:Windows-10-16299.309",
+        "os:Windows-10-16299",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -36171,7 +36171,7 @@
       ],
       "dimensions": [
         "gpu:10de:1cb3-25.21.14.1678",
-        "os:Windows-10-16299.309",
+        "os:Windows-10-16299",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -36273,7 +36273,7 @@
       ],
       "dimensions": [
         "gpu:10de:1cb3-25.21.14.1678",
-        "os:Windows-10-16299.309",
+        "os:Windows-10-16299",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -36389,7 +36389,7 @@
       ],
       "dimensions": [
         "gpu:8086:162b-20.19.15.4963",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -36505,7 +36505,7 @@
       ],
       "dimensions": [
         "gpu:8086:162b-20.19.15.4963",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -36621,7 +36621,7 @@
       ],
       "dimensions": [
         "gpu:8086:162b-20.19.15.4963",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -36737,7 +36737,7 @@
       ],
       "dimensions": [
         "gpu:8086:162b-20.19.15.4963",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -36853,7 +36853,7 @@
       ],
       "dimensions": [
         "gpu:8086:1926-25.20.100.6519",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -36969,7 +36969,7 @@
       ],
       "dimensions": [
         "gpu:8086:1926-25.20.100.6519",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -37085,7 +37085,7 @@
       ],
       "dimensions": [
         "gpu:8086:1926-25.20.100.6519",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -37201,7 +37201,7 @@
       ],
       "dimensions": [
         "gpu:8086:1926-25.20.100.6519",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -37317,7 +37317,7 @@
       ],
       "dimensions": [
         "gpu:8086:1926-25.20.100.6519",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -37433,7 +37433,7 @@
       ],
       "dimensions": [
         "gpu:8086:1926-25.20.100.6519",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -37549,7 +37549,7 @@
       ],
       "dimensions": [
         "gpu:8086:3ea5-25.20.100.6519",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -37665,7 +37665,7 @@
       ],
       "dimensions": [
         "gpu:8086:3ea5-25.20.100.6519",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -37781,7 +37781,7 @@
       ],
       "dimensions": [
         "gpu:8086:3ea5-25.20.100.6519",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -37897,7 +37897,7 @@
       ],
       "dimensions": [
         "gpu:8086:3ea5-25.20.100.6519",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -38013,7 +38013,7 @@
       ],
       "dimensions": [
         "gpu:8086:3ea5-25.20.100.6519",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -38129,7 +38129,7 @@
       ],
       "dimensions": [
         "gpu:8086:3ea5-25.20.100.6519",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -38245,7 +38245,7 @@
       ],
       "dimensions": [
         "gpu:8086:0a16-20.19.15.4963",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -38361,7 +38361,7 @@
       ],
       "dimensions": [
         "gpu:8086:0a16-20.19.15.4963",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -38477,7 +38477,7 @@
       ],
       "dimensions": [
         "gpu:8086:0a16-20.19.15.4963",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -38593,7 +38593,7 @@
       ],
       "dimensions": [
         "gpu:8086:0a16-20.19.15.4963",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -38709,7 +38709,7 @@
       ],
       "dimensions": [
         "gpu:10de:11c0-25.21.14.1634",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -38825,7 +38825,7 @@
       ],
       "dimensions": [
         "gpu:10de:11c0-25.21.14.1634",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -38941,7 +38941,7 @@
       ],
       "dimensions": [
         "gpu:10de:11c0-25.21.14.1634",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -39057,7 +39057,7 @@
       ],
       "dimensions": [
         "gpu:10de:11c0-25.21.14.1634",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -39173,7 +39173,7 @@
       ],
       "dimensions": [
         "gpu:10de:11c0-25.21.14.1634",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -39289,7 +39289,7 @@
       ],
       "dimensions": [
         "gpu:10de:11c0-25.21.14.1634",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -39405,7 +39405,7 @@
       ],
       "dimensions": [
         "gpu:1002:683d-24.20.13001.1010",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -39521,7 +39521,7 @@
       ],
       "dimensions": [
         "gpu:1002:683d-24.20.13001.1010",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -39637,7 +39637,7 @@
       ],
       "dimensions": [
         "gpu:1002:683d-24.20.13001.1010",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -39753,7 +39753,7 @@
       ],
       "dimensions": [
         "gpu:1002:683d-24.20.13001.1010",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -39869,7 +39869,7 @@
       ],
       "dimensions": [
         "gpu:1002:683d-24.20.13001.1010",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -39985,7 +39985,7 @@
       ],
       "dimensions": [
         "gpu:1002:683d-24.20.13001.1010",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -40101,7 +40101,7 @@
       ],
       "dimensions": [
         "gpu:10de:1401-25.21.14.1634",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -40217,7 +40217,7 @@
       ],
       "dimensions": [
         "gpu:10de:1401-25.21.14.1634",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -40333,7 +40333,7 @@
       ],
       "dimensions": [
         "gpu:10de:1401-25.21.14.1634",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -40449,7 +40449,7 @@
       ],
       "dimensions": [
         "gpu:10de:1401-25.21.14.1634",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -40565,7 +40565,7 @@
       ],
       "dimensions": [
         "gpu:10de:1401-25.21.14.1634",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -40681,7 +40681,7 @@
       ],
       "dimensions": [
         "gpu:10de:1401-25.21.14.1634",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -40797,7 +40797,7 @@
       ],
       "dimensions": [
         "gpu:10de:1cb3-25.21.14.1678",
-        "os:Windows-10-16299.309",
+        "os:Windows-10-16299",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -40913,7 +40913,7 @@
       ],
       "dimensions": [
         "gpu:10de:1cb3-25.21.14.1678",
-        "os:Windows-10-16299.309",
+        "os:Windows-10-16299",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -41029,7 +41029,7 @@
       ],
       "dimensions": [
         "gpu:10de:1cb3-25.21.14.1678",
-        "os:Windows-10-16299.309",
+        "os:Windows-10-16299",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -41145,7 +41145,7 @@
       ],
       "dimensions": [
         "gpu:10de:1cb3-25.21.14.1678",
-        "os:Windows-10-16299.309",
+        "os:Windows-10-16299",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -41263,7 +41263,7 @@
         "cpu:x86-64-Haswell_GCE",
         "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-standard-16",
-        "os:Windows-2016Server-14393",
+        "os:Windows-Server-14393",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -41381,7 +41381,7 @@
         "cpu:x86-64-Haswell_GCE",
         "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-standard-16",
-        "os:Windows-2016Server-14393",
+        "os:Windows-Server-14393",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -41499,7 +41499,7 @@
         "cpu:x86-64-Haswell_GCE",
         "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-standard-16",
-        "os:Windows-2016Server-14393",
+        "os:Windows-Server-14393",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -41617,7 +41617,7 @@
         "cpu:x86-64-Haswell_GCE",
         "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-standard-16",
-        "os:Windows-2016Server-14393",
+        "os:Windows-Server-14393",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -41735,7 +41735,7 @@
         "cpu:x86-64-Haswell_GCE",
         "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-standard-16",
-        "os:Windows-2016Server-14393",
+        "os:Windows-Server-14393",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -41853,7 +41853,7 @@
         "cpu:x86-64-Haswell_GCE",
         "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-standard-16",
-        "os:Windows-2016Server-14393",
+        "os:Windows-Server-14393",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -41971,7 +41971,7 @@
         "cpu:x86-64-Haswell_GCE",
         "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-standard-16",
-        "os:Windows-2016Server-14393",
+        "os:Windows-Server-14393",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -63544,7 +63544,7 @@
       ],
       "dimensions": [
         "gpu:1002:6646-24.20.13001.1010",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -63660,7 +63660,7 @@
       ],
       "dimensions": [
         "gpu:1002:6646-24.20.13001.1010",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -63776,7 +63776,7 @@
       ],
       "dimensions": [
         "gpu:1002:6646-24.20.13001.1010",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -63892,7 +63892,7 @@
       ],
       "dimensions": [
         "gpu:1002:6646-24.20.13001.1010",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -64008,7 +64008,7 @@
       ],
       "dimensions": [
         "gpu:1002:6646-24.20.13001.1010",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -64124,7 +64124,7 @@
       ],
       "dimensions": [
         "gpu:1002:6646-24.20.13001.1010",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -64240,7 +64240,7 @@
       ],
       "dimensions": [
         "gpu:10de:104a-23.21.13.9101",
-        "os:Windows-10-16299.309",
+        "os:Windows-10-16299",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -64356,7 +64356,7 @@
       ],
       "dimensions": [
         "gpu:10de:104a-23.21.13.9101",
-        "os:Windows-10-16299.309",
+        "os:Windows-10-16299",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -64472,7 +64472,7 @@
       ],
       "dimensions": [
         "gpu:10de:104a-23.21.13.9101",
-        "os:Windows-10-16299.309",
+        "os:Windows-10-16299",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -64588,7 +64588,7 @@
       ],
       "dimensions": [
         "gpu:10de:104a-23.21.13.9101",
-        "os:Windows-10-16299.309",
+        "os:Windows-10-16299",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -64704,7 +64704,7 @@
       ],
       "dimensions": [
         "gpu:10de:1cb3-25.21.14.1678",
-        "os:Windows-10-16299.309",
+        "os:Windows-10-16299",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -64820,7 +64820,7 @@
       ],
       "dimensions": [
         "gpu:10de:1cb3-25.21.14.1678",
-        "os:Windows-10-16299.309",
+        "os:Windows-10-16299",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -64936,7 +64936,7 @@
       ],
       "dimensions": [
         "gpu:10de:1cb3-25.21.14.1678",
-        "os:Windows-10-16299.309",
+        "os:Windows-10-16299",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -65052,7 +65052,7 @@
       ],
       "dimensions": [
         "gpu:10de:1cb3-25.21.14.1678",
-        "os:Windows-10-16299.309",
+        "os:Windows-10-16299",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -65173,7 +65173,7 @@
       ],
       "dimensions": [
         "gpu:10de:1cb3-25.21.14.1678",
-        "os:Windows-10-16299.309",
+        "os:Windows-10-16299",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -65289,7 +65289,7 @@
       ],
       "dimensions": [
         "gpu:10de:1cb3-25.21.14.1678",
-        "os:Windows-10-16299.309",
+        "os:Windows-10-16299",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -65405,7 +65405,7 @@
       ],
       "dimensions": [
         "gpu:10de:1cb3-25.21.14.1678",
-        "os:Windows-10-16299.309",
+        "os:Windows-10-16299",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -65521,7 +65521,7 @@
       ],
       "dimensions": [
         "gpu:10de:1cb3-25.21.14.1678",
-        "os:Windows-10-16299.309",
+        "os:Windows-10-16299",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -65637,7 +65637,7 @@
       ],
       "dimensions": [
         "gpu:10de:1cb3-25.21.14.1678",
-        "os:Windows-10-16299.309",
+        "os:Windows-10-16299",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -65753,7 +65753,7 @@
       ],
       "dimensions": [
         "gpu:10de:1cb3-25.21.14.1678",
-        "os:Windows-10-16299.309",
+        "os:Windows-10-16299",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -65874,7 +65874,7 @@
       ],
       "dimensions": [
         "gpu:10de:1cb3-25.21.14.1678",
-        "os:Windows-10-16299.309",
+        "os:Windows-10-16299",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -65990,7 +65990,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-i7-5557U",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -66106,7 +66106,7 @@
       ],
       "dimensions": [
         "gpu:8086:162b-20.19.15.4963",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -66222,7 +66222,7 @@
       ],
       "dimensions": [
         "gpu:8086:162b-20.19.15.4963",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -66338,7 +66338,7 @@
       ],
       "dimensions": [
         "gpu:8086:162b-20.19.15.4963",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -66454,7 +66454,7 @@
       ],
       "dimensions": [
         "gpu:8086:162b-20.19.15.4963",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -66570,7 +66570,7 @@
       ],
       "dimensions": [
         "gpu:8086:1926-25.20.100.6519",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -66686,7 +66686,7 @@
       ],
       "dimensions": [
         "gpu:8086:1926-25.20.100.6519",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -66802,7 +66802,7 @@
       ],
       "dimensions": [
         "gpu:8086:1926-25.20.100.6519",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -66918,7 +66918,7 @@
       ],
       "dimensions": [
         "gpu:8086:1926-25.20.100.6519",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -67034,7 +67034,7 @@
       ],
       "dimensions": [
         "gpu:8086:1926-25.20.100.6519",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -67150,7 +67150,7 @@
       ],
       "dimensions": [
         "gpu:8086:1926-25.20.100.6519",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -67266,7 +67266,7 @@
       ],
       "dimensions": [
         "gpu:8086:1926-25.20.100.6519",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -67382,7 +67382,7 @@
       ],
       "dimensions": [
         "gpu:8086:1926-25.20.100.6519",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -67498,7 +67498,7 @@
       ],
       "dimensions": [
         "gpu:8086:3ea5-25.20.100.6519",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -67614,7 +67614,7 @@
       ],
       "dimensions": [
         "gpu:8086:3ea5-25.20.100.6519",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -67730,7 +67730,7 @@
       ],
       "dimensions": [
         "gpu:8086:3ea5-25.20.100.6519",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -67846,7 +67846,7 @@
       ],
       "dimensions": [
         "gpu:8086:3ea5-25.20.100.6519",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -67962,7 +67962,7 @@
       ],
       "dimensions": [
         "gpu:8086:3ea5-25.20.100.6519",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -68078,7 +68078,7 @@
       ],
       "dimensions": [
         "gpu:8086:3ea5-25.20.100.6519",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -68194,7 +68194,7 @@
       ],
       "dimensions": [
         "gpu:8086:3ea5-25.20.100.6519",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -68310,7 +68310,7 @@
       ],
       "dimensions": [
         "gpu:8086:0a16-20.19.15.4963",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -68426,7 +68426,7 @@
       ],
       "dimensions": [
         "gpu:8086:0a16-20.19.15.4963",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -68542,7 +68542,7 @@
       ],
       "dimensions": [
         "gpu:8086:0a16-20.19.15.4963",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -68658,7 +68658,7 @@
       ],
       "dimensions": [
         "gpu:8086:0a16-20.19.15.4963",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -68774,7 +68774,7 @@
       ],
       "dimensions": [
         "gpu:10de:11c0-25.21.14.1634",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -68890,7 +68890,7 @@
       ],
       "dimensions": [
         "gpu:10de:11c0-25.21.14.1634",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -69006,7 +69006,7 @@
       ],
       "dimensions": [
         "gpu:10de:11c0-25.21.14.1634",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -69122,7 +69122,7 @@
       ],
       "dimensions": [
         "gpu:10de:11c0-25.21.14.1634",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -69238,7 +69238,7 @@
       ],
       "dimensions": [
         "gpu:10de:11c0-25.21.14.1634",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -69354,7 +69354,7 @@
       ],
       "dimensions": [
         "gpu:10de:11c0-25.21.14.1634",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -69470,7 +69470,7 @@
       ],
       "dimensions": [
         "gpu:1002:683d-24.20.13001.1010",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -69586,7 +69586,7 @@
       ],
       "dimensions": [
         "gpu:1002:683d-24.20.13001.1010",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -69702,7 +69702,7 @@
       ],
       "dimensions": [
         "gpu:1002:683d-24.20.13001.1010",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -69818,7 +69818,7 @@
       ],
       "dimensions": [
         "gpu:1002:683d-24.20.13001.1010",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -69934,7 +69934,7 @@
       ],
       "dimensions": [
         "gpu:1002:683d-24.20.13001.1010",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -70050,7 +70050,7 @@
       ],
       "dimensions": [
         "gpu:1002:683d-24.20.13001.1010",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -70166,7 +70166,7 @@
       ],
       "dimensions": [
         "gpu:10de:1401-25.21.14.1634",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -70282,7 +70282,7 @@
       ],
       "dimensions": [
         "gpu:10de:1401-25.21.14.1634",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -70398,7 +70398,7 @@
       ],
       "dimensions": [
         "gpu:10de:1401-25.21.14.1634",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -70514,7 +70514,7 @@
       ],
       "dimensions": [
         "gpu:10de:1401-25.21.14.1634",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -70630,7 +70630,7 @@
       ],
       "dimensions": [
         "gpu:10de:1401-25.21.14.1634",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -70746,7 +70746,7 @@
       ],
       "dimensions": [
         "gpu:10de:1401-25.21.14.1634",
-        "os:Windows-10-17763.557",
+        "os:Windows-10-18362",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -70862,7 +70862,7 @@
       ],
       "dimensions": [
         "gpu:10de:1cb3-25.21.14.1678",
-        "os:Windows-10-16299.309",
+        "os:Windows-10-16299",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -70978,7 +70978,7 @@
       ],
       "dimensions": [
         "gpu:10de:1cb3-25.21.14.1678",
-        "os:Windows-10-16299.309",
+        "os:Windows-10-16299",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -71094,7 +71094,7 @@
       ],
       "dimensions": [
         "gpu:10de:1cb3-25.21.14.1678",
-        "os:Windows-10-16299.309",
+        "os:Windows-10-16299",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -71210,7 +71210,7 @@
       ],
       "dimensions": [
         "gpu:10de:1cb3-25.21.14.1678",
-        "os:Windows-10-16299.309",
+        "os:Windows-10-16299",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -71328,7 +71328,7 @@
         "cpu:x86-64-Haswell_GCE",
         "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-standard-16",
-        "os:Windows-2016Server-14393",
+        "os:Windows-Server-14393",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -71446,7 +71446,7 @@
         "cpu:x86-64-Haswell_GCE",
         "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-standard-16",
-        "os:Windows-2016Server-14393",
+        "os:Windows-Server-14393",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -71564,7 +71564,7 @@
         "cpu:x86-64-Haswell_GCE",
         "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-standard-16",
-        "os:Windows-2016Server-14393",
+        "os:Windows-Server-14393",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -71682,7 +71682,7 @@
         "cpu:x86-64-Haswell_GCE",
         "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-standard-16",
-        "os:Windows-2016Server-14393",
+        "os:Windows-Server-14393",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -71800,7 +71800,7 @@
         "cpu:x86-64-Haswell_GCE",
         "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-standard-16",
-        "os:Windows-2016Server-14393",
+        "os:Windows-Server-14393",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -71918,7 +71918,7 @@
         "cpu:x86-64-Haswell_GCE",
         "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-standard-16",
-        "os:Windows-2016Server-14393",
+        "os:Windows-Server-14393",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -72036,7 +72036,7 @@
         "cpu:x86-64-Haswell_GCE",
         "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-standard-16",
-        "os:Windows-2016Server-14393",
+        "os:Windows-Server-14393",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -72154,7 +72154,7 @@
         "cpu:x86-64-Haswell_GCE",
         "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-standard-16",
-        "os:Windows-2016Server-14393",
+        "os:Windows-Server-14393",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -72272,7 +72272,7 @@
         "cpu:x86-64-Haswell_GCE",
         "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-standard-16",
-        "os:Windows-2016Server-14393",
+        "os:Windows-Server-14393",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -72390,7 +72390,7 @@
         "cpu:x86-64-Haswell_GCE",
         "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-standard-16",
-        "os:Windows-2016Server-14393",
+        "os:Windows-Server-14393",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -72508,7 +72508,7 @@
         "cpu:x86-64-Haswell_GCE",
         "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-standard-16",
-        "os:Windows-2016Server-14393",
+        "os:Windows-Server-14393",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -72626,7 +72626,7 @@
         "cpu:x86-64-Haswell_GCE",
         "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-standard-16",
-        "os:Windows-2016Server-14393",
+        "os:Windows-Server-14393",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -72744,7 +72744,7 @@
         "cpu:x86-64-Haswell_GCE",
         "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-standard-16",
-        "os:Windows-2016Server-14393",
+        "os:Windows-Server-14393",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -72862,7 +72862,7 @@
         "cpu:x86-64-Haswell_GCE",
         "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-standard-16",
-        "os:Windows-2016Server-14393",
+        "os:Windows-Server-14393",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -72980,7 +72980,7 @@
         "cpu:x86-64-Haswell_GCE",
         "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-standard-16",
-        "os:Windows-2016Server-14393",
+        "os:Windows-Server-14393",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -73098,7 +73098,7 @@
         "cpu:x86-64-Haswell_GCE",
         "image:windows-server-2016-dc-v20190108",
         "machine_type:n1-standard-16",
-        "os:Windows-2016Server-14393",
+        "os:Windows-Server-14393",
         "pool:Skia"
       ],
       "env_prefixes": {