diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg
index 70e10a6..ee9b319 100644
--- a/generated/commit-queue.cfg
+++ b/generated/commit-queue.cfg
@@ -137,31 +137,31 @@
         name: "boringssl/try/win32"
       }
       builders {
+        name: "boringssl/try/win32_clang_compile"
+      }
+      builders {
         name: "boringssl/try/win32_rel"
       }
       builders {
         name: "boringssl/try/win32_small"
       }
       builders {
-        name: "boringssl/try/win32_vs2017_clang_compile"
-      }
-      builders {
-        name: "boringssl/try/win32_vs2017_compile"
+        name: "boringssl/try/win32_vs2019_compile"
       }
       builders {
         name: "boringssl/try/win64"
       }
       builders {
+        name: "boringssl/try/win64_clang_compile"
+      }
+      builders {
         name: "boringssl/try/win64_rel"
       }
       builders {
         name: "boringssl/try/win64_small"
       }
       builders {
-        name: "boringssl/try/win64_vs2017_clang_compile"
-      }
-      builders {
-        name: "boringssl/try/win64_vs2017_compile"
+        name: "boringssl/try/win64_vs2019_compile"
       }
       builders {
         name: "boringssl/try/win_arm64_compile"
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 2384dc2..93f42a8 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -1234,6 +1234,43 @@
       }
     }
     builders {
+      name: "win32_clang"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.flex.ci"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$gatekeeper": {'
+        '    "group": "client.boringssl"'
+        '  },'
+        '  "recipe": "boringssl"'
+        '}'
+      execution_timeout_secs: 1800
+      caches {
+        name: "gocache"
+        path: "gocache"
+      }
+      caches {
+        name: "gopath"
+        path: "gopath"
+      }
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      service_account: "boringssl-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
       name: "win32_rel"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
@@ -1345,7 +1382,7 @@
       }
     }
     builders {
-      name: "win32_vs2017"
+      name: "win32_vs2019"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "os:Windows-10"
@@ -1361,47 +1398,7 @@
         '    "group": "client.boringssl"'
         '  },'
         '  "gclient_vars": {'
-        '    "vs_version": "2017"'
-        '  },'
-        '  "recipe": "boringssl"'
-        '}'
-      execution_timeout_secs: 1800
-      caches {
-        name: "gocache"
-        path: "gocache"
-      }
-      caches {
-        name: "gopath"
-        path: "gopath"
-      }
-      caches {
-        name: "win_toolchain"
-        path: "win_toolchain"
-      }
-      service_account: "boringssl-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "win32_vs2017_clang"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.flex.ci"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$gatekeeper": {'
-        '    "group": "client.boringssl"'
-        '  },'
-        '  "gclient_vars": {'
-        '    "vs_version": "2017"'
+        '    "vs_version": "2019"'
         '  },'
         '  "recipe": "boringssl"'
         '}'
@@ -1462,6 +1459,43 @@
       }
     }
     builders {
+      name: "win64_clang"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.flex.ci"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$gatekeeper": {'
+        '    "group": "client.boringssl"'
+        '  },'
+        '  "recipe": "boringssl"'
+        '}'
+      execution_timeout_secs: 1800
+      caches {
+        name: "gocache"
+        path: "gocache"
+      }
+      caches {
+        name: "gopath"
+        path: "gopath"
+      }
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      service_account: "boringssl-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
       name: "win64_rel"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
@@ -1573,7 +1607,7 @@
       }
     }
     builders {
-      name: "win64_vs2017"
+      name: "win64_vs2019"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "os:Windows-10"
@@ -1589,47 +1623,7 @@
         '    "group": "client.boringssl"'
         '  },'
         '  "gclient_vars": {'
-        '    "vs_version": "2017"'
-        '  },'
-        '  "recipe": "boringssl"'
-        '}'
-      execution_timeout_secs: 1800
-      caches {
-        name: "gocache"
-        path: "gocache"
-      }
-      caches {
-        name: "gopath"
-        path: "gopath"
-      }
-      caches {
-        name: "win_toolchain"
-        path: "win_toolchain"
-      }
-      service_account: "boringssl-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "win64_vs2017_clang"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.flex.ci"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "$gatekeeper": {'
-        '    "group": "client.boringssl"'
-        '  },'
-        '  "gclient_vars": {'
-        '    "vs_version": "2017"'
+        '    "vs_version": "2019"'
         '  },'
         '  "recipe": "boringssl"'
         '}'
@@ -1677,8 +1671,7 @@
         '    "CMAKE_SYSTEM_PROCESSOR": "arm64"'
         '  },'
         '  "gclient_vars": {'
-        '    "checkout_nasm": false,'
-        '    "vs_version": "2017"'
+        '    "checkout_nasm": false'
         '  },'
         '  "msvc_target": "arm64",'
         '  "recipe": "boringssl",'
@@ -2549,6 +2542,34 @@
       }
     }
     builders {
+      name: "win32_clang_compile"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.flex.try"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "recipe": "boringssl",'
+        '  "run_ssl_tests": false,'
+        '  "run_unit_tests": false'
+        '}'
+      execution_timeout_secs: 1800
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
       name: "win32_rel"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
@@ -2601,7 +2622,7 @@
       }
     }
     builders {
-      name: "win32_vs2017_clang_compile"
+      name: "win32_vs2019_compile"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "os:Windows-10"
@@ -2614,38 +2635,7 @@
       properties:
         '{'
         '  "gclient_vars": {'
-        '    "vs_version": "2017"'
-        '  },'
-        '  "recipe": "boringssl",'
-        '  "run_ssl_tests": false,'
-        '  "run_unit_tests": false'
-        '}'
-      execution_timeout_secs: 1800
-      caches {
-        name: "win_toolchain"
-        path: "win_toolchain"
-      }
-      service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "win32_vs2017_compile"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.flex.try"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "gclient_vars": {'
-        '    "vs_version": "2017"'
+        '    "vs_version": "2019"'
         '  },'
         '  "recipe": "boringssl",'
         '  "run_ssl_tests": false,'
@@ -2689,6 +2679,34 @@
       }
     }
     builders {
+      name: "win64_clang_compile"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.flex.try"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "recipe": "boringssl",'
+        '  "run_ssl_tests": false,'
+        '  "run_unit_tests": false'
+        '}'
+      execution_timeout_secs: 1800
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+    builders {
       name: "win64_rel"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
@@ -2741,7 +2759,7 @@
       }
     }
     builders {
-      name: "win64_vs2017_clang_compile"
+      name: "win64_vs2019_compile"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
       dimensions: "os:Windows-10"
@@ -2754,38 +2772,7 @@
       properties:
         '{'
         '  "gclient_vars": {'
-        '    "vs_version": "2017"'
-        '  },'
-        '  "recipe": "boringssl",'
-        '  "run_ssl_tests": false,'
-        '  "run_unit_tests": false'
-        '}'
-      execution_timeout_secs: 1800
-      caches {
-        name: "win_toolchain"
-        path: "win_toolchain"
-      }
-      service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "luci.recipes.use_python3"
-        value: 100
-      }
-    }
-    builders {
-      name: "win64_vs2017_compile"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Windows-10"
-      dimensions: "pool:luci.flex.try"
-      exe {
-        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
-        cipd_version: "refs/heads/main"
-        cmd: "luciexe"
-      }
-      properties:
-        '{'
-        '  "gclient_vars": {'
-        '    "vs_version": "2017"'
+        '    "vs_version": "2019"'
         '  },'
         '  "recipe": "boringssl",'
         '  "run_ssl_tests": false,'
@@ -2824,8 +2811,7 @@
         '    "CMAKE_SYSTEM_PROCESSOR": "arm64"'
         '  },'
         '  "gclient_vars": {'
-        '    "checkout_nasm": false,'
-        '    "vs_version": "2017"'
+        '    "checkout_nasm": false'
         '  },'
         '  "msvc_target": "arm64",'
         '  "recipe": "boringssl",'
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg
index c07d49f..cfee38a 100644
--- a/generated/luci-milo.cfg
+++ b/generated/luci-milo.cfg
@@ -205,14 +205,14 @@
     short_name: "sm"
   }
   builders {
-    name: "buildbucket/luci.boringssl.ci/win32_vs2017"
-    category: "win|32|vs 2017"
-    short_name: "dbg"
+    name: "buildbucket/luci.boringssl.ci/win32_vs2019"
+    category: "win|32"
+    short_name: "vs2019"
   }
   builders {
-    name: "buildbucket/luci.boringssl.ci/win32_vs2017_clang"
-    category: "win|32|vs 2017"
-    short_name: "clg"
+    name: "buildbucket/luci.boringssl.ci/win32_clang"
+    category: "win|32"
+    short_name: "clang"
   }
   builders {
     name: "buildbucket/luci.boringssl.ci/win64"
@@ -235,13 +235,13 @@
     short_name: "sm"
   }
   builders {
-    name: "buildbucket/luci.boringssl.ci/win64_vs2017"
-    category: "win|64|vs 2017"
-    short_name: "dbg"
+    name: "buildbucket/luci.boringssl.ci/win64_vs2019"
+    category: "win|64"
+    short_name: "vs2019"
   }
   builders {
-    name: "buildbucket/luci.boringssl.ci/win64_vs2017_clang"
-    category: "win|64|vs 2017"
+    name: "buildbucket/luci.boringssl.ci/win64_clang"
+    category: "win|64"
     short_name: "clg"
   }
   builders {
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg
index 0ac5765..beebc6a 100644
--- a/generated/luci-notify.cfg
+++ b/generated/luci-notify.cfg
@@ -555,6 +555,21 @@
   }
   builders {
     bucket: "ci"
+    name: "win32_clang"
+    repository: "https://boringssl.googlesource.com/boringssl"
+  }
+}
+notifiers {
+  notifications {
+    on_occurrence: FAILURE
+    on_occurrence: INFRA_FAILURE
+    on_new_status: SUCCESS
+    email {
+      recipients: "boringssl@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
     name: "win32_rel"
     repository: "https://boringssl.googlesource.com/boringssl"
   }
@@ -600,22 +615,7 @@
   }
   builders {
     bucket: "ci"
-    name: "win32_vs2017"
-    repository: "https://boringssl.googlesource.com/boringssl"
-  }
-}
-notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    on_occurrence: INFRA_FAILURE
-    on_new_status: SUCCESS
-    email {
-      recipients: "boringssl@google.com"
-    }
-  }
-  builders {
-    bucket: "ci"
-    name: "win32_vs2017_clang"
+    name: "win32_vs2019"
     repository: "https://boringssl.googlesource.com/boringssl"
   }
 }
@@ -645,6 +645,21 @@
   }
   builders {
     bucket: "ci"
+    name: "win64_clang"
+    repository: "https://boringssl.googlesource.com/boringssl"
+  }
+}
+notifiers {
+  notifications {
+    on_occurrence: FAILURE
+    on_occurrence: INFRA_FAILURE
+    on_new_status: SUCCESS
+    email {
+      recipients: "boringssl@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
     name: "win64_rel"
     repository: "https://boringssl.googlesource.com/boringssl"
   }
@@ -690,22 +705,7 @@
   }
   builders {
     bucket: "ci"
-    name: "win64_vs2017"
-    repository: "https://boringssl.googlesource.com/boringssl"
-  }
-}
-notifiers {
-  notifications {
-    on_occurrence: FAILURE
-    on_occurrence: INFRA_FAILURE
-    on_new_status: SUCCESS
-    email {
-      recipients: "boringssl@google.com"
-    }
-  }
-  builders {
-    bucket: "ci"
-    name: "win64_vs2017_clang"
+    name: "win64_vs2019"
     repository: "https://boringssl.googlesource.com/boringssl"
   }
 }
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg
index 8a258cf..b87bb50 100644
--- a/generated/luci-scheduler.cfg
+++ b/generated/luci-scheduler.cfg
@@ -365,6 +365,16 @@
   }
 }
 job {
+  id: "win32_clang"
+  realm: "ci"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci"
+    builder: "win32_clang"
+  }
+}
+job {
   id: "win32_rel"
   realm: "ci"
   acl_sets: "ci"
@@ -395,23 +405,13 @@
   }
 }
 job {
-  id: "win32_vs2017"
+  id: "win32_vs2019"
   realm: "ci"
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci"
-    builder: "win32_vs2017"
-  }
-}
-job {
-  id: "win32_vs2017_clang"
-  realm: "ci"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "win32_vs2017_clang"
+    builder: "win32_vs2019"
   }
 }
 job {
@@ -425,6 +425,16 @@
   }
 }
 job {
+  id: "win64_clang"
+  realm: "ci"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci"
+    builder: "win64_clang"
+  }
+}
+job {
   id: "win64_rel"
   realm: "ci"
   acl_sets: "ci"
@@ -455,23 +465,13 @@
   }
 }
 job {
-  id: "win64_vs2017"
+  id: "win64_vs2019"
   realm: "ci"
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
     bucket: "ci"
-    builder: "win64_vs2017"
-  }
-}
-job {
-  id: "win64_vs2017_clang"
-  realm: "ci"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "ci"
-    builder: "win64_vs2017_clang"
+    builder: "win64_vs2019"
   }
 }
 job {
@@ -524,17 +524,17 @@
   triggers: "mac_rel"
   triggers: "mac_small"
   triggers: "win32"
+  triggers: "win32_clang"
   triggers: "win32_rel"
   triggers: "win32_sde"
   triggers: "win32_small"
-  triggers: "win32_vs2017"
-  triggers: "win32_vs2017_clang"
+  triggers: "win32_vs2019"
   triggers: "win64"
+  triggers: "win64_clang"
   triggers: "win64_rel"
   triggers: "win64_sde"
   triggers: "win64_small"
-  triggers: "win64_vs2017"
-  triggers: "win64_vs2017_clang"
+  triggers: "win64_vs2019"
   triggers: "win_arm64_compile"
   gitiles {
     repo: "https://boringssl.googlesource.com/boringssl"
diff --git a/generated/project.cfg b/generated/project.cfg
index e193683..ca1238c 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -7,7 +7,7 @@
 name: "boringssl"
 access: "group:all"
 lucicfg {
-  version: "1.30.9"
+  version: "1.30.10"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"
diff --git a/main.star b/main.star
index f9a2d41..6dffb8c 100755
--- a/main.star
+++ b/main.star
@@ -506,26 +506,22 @@
 )
 both_builders("win32_small", WIN_HOST, category = "win|32", short_name = "sm")
 
-# To reduce cycle times, the CQ VS2017 builders are compile-only.
 both_builders(
-    "win32_vs2017",
+    "win32_vs2019",
     WIN_HOST,
-    category = "win|32|vs 2017",
-    short_name = "dbg",
-    cq_compile_only = True,
+    category = "win|32",
+    short_name = "vs2019",
+    cq_compile_only = True,  # Reduce CQ cycle times.
     properties = {
-        "gclient_vars": {"vs_version": "2017"},
+        "gclient_vars": {"vs_version": "2019"},
     },
 )
 both_builders(
-    "win32_vs2017_clang",
+    "win32_clang",
     WIN_HOST,
-    category = "win|32|vs 2017",
-    short_name = "clg",
-    cq_compile_only = True,
-    properties = {
-        "gclient_vars": {"vs_version": "2017"},
-    },
+    category = "win|32",
+    short_name = "clang",
+    cq_compile_only = True,  # Reduce CQ cycle times.
 )
 
 both_builders("win64", WIN_HOST, category = "win|64", short_name = "dbg")
@@ -539,26 +535,22 @@
 )
 both_builders("win64_small", WIN_HOST, category = "win|64", short_name = "sm")
 
-# To reduce cycle times, the CQ VS2017 builders are compile-only.
 both_builders(
-    "win64_vs2017",
+    "win64_vs2019",
     WIN_HOST,
-    category = "win|64|vs 2017",
-    short_name = "dbg",
-    cq_compile_only = True,
+    category = "win|64",
+    short_name = "vs2019",
+    cq_compile_only = True,  # Reduce CQ cycle times.
     properties = {
-        "gclient_vars": {"vs_version": "2017"},
+        "gclient_vars": {"vs_version": "2019"},
     },
 )
 both_builders(
-    "win64_vs2017_clang",
+    "win64_clang",
     WIN_HOST,
-    category = "win|64|vs 2017",
+    category = "win|64",
     short_name = "clg",
-    cq_compile_only = True,
-    properties = {
-        "gclient_vars": {"vs_version": "2017"},
-    },
+    cq_compile_only = True,  # Reduce CQ cycle times.
 )
 
 both_builders(
@@ -578,7 +570,6 @@
         },
         "gclient_vars": {
             "checkout_nasm": False,
-            "vs_version": "2017",
         },
         "msvc_target": "arm64",
         "run_unit_tests": False,