diff --git a/scripts/wk/cfg/windows_builds.py b/scripts/wk/cfg/windows_builds.py
index 580564b4..8e74c055 100644
--- a/scripts/wk/cfg/windows_builds.py
+++ b/scripts/wk/cfg/windows_builds.py
@@ -33,4 +33,9 @@ WINDOWS_BUILDS = {
   '10.0.19042': '20H2',
   '10.0.19043': '21H1',
   '10.0.19044': '21H2',
+  '10.0.19045': '22H2',
+
+  # Windows 11
+  '10.0.22000': '21H2',
+  '10.0.22621': '22H2',
 }
diff --git a/scripts/wk/os/win.py b/scripts/wk/os/win.py
index 7a9e7400..331d75a4 100644
--- a/scripts/wk/os/win.py
+++ b/scripts/wk/os/win.py
@@ -253,6 +253,8 @@ def get_os_name(as_list=False, check=True):
   display_name = (
     f'{reg_read_value("HKLM", key, "ProductName")} {ARCH}-bit {details}'
     )
+  if build_version >= 22000:
+    display_name = display_name.replace('Windows 10', 'Windows 11')
 
   # Check for support issues
   if check: