diff --git a/angle/build/config/win/BUILD.gn b/angle/build/config/win/BUILD.gn
index de6a476..651bcaa 100644
--- a/angle/build/config/win/BUILD.gn
+++ b/angle/build/config/win/BUILD.gn
@@ -295,7 +295,7 @@ config("runtime_library") {
 # manually override this config for their compiles.
 config("winver") {
   defines = [
-    "NTDDI_VERSION=NTDDI_WIN10_CO",
+    "NTDDI_VERSION=NTDDI_WIN10_NI",
 
     # We can't say `=_WIN32_WINNT_WIN10` here because some files do
     # `#if WINVER < 0x0600` without including windows.h before,
diff --git a/angle/build/toolchain/win/setup_toolchain.py b/angle/build/toolchain/win/setup_toolchain.py
index 4bbc55e..2b8cf10 100644
--- a/angle/build/toolchain/win/setup_toolchain.py
+++ b/angle/build/toolchain/win/setup_toolchain.py
@@ -184,7 +184,7 @@ def _LoadToolchainEnv(cpu, toolchain_root, sdk_dir, target_store):
     # Explicitly specifying the SDK version to build with to avoid accidentally
     # building with a new and untested SDK. This should stay in sync with the
     # packaged toolchain in build/vs_toolchain.py.
-    args.append('10.0.22000.0')
+    args.append('10.0.22621.0')
     variables = _LoadEnvFromBat(args)
   return _ExtractImportantEnvironment(variables)