diff --git a/.github/matrix_includes_buildmgr.json b/.github/matrix_includes_buildmgr.json
index 47c2bd1c5..5a2030872 100644
--- a/.github/matrix_includes_buildmgr.json
+++ b/.github/matrix_includes_buildmgr.json
@@ -40,7 +40,7 @@
         "runOn": "always"
     },
     {
-        "runs_on":"windows-2019",
+        "runs_on":"windows-2022",
         "target":"windows",
         "arch": "amd64",
         "binary_extension":".exe-amd64",
@@ -50,7 +50,7 @@
         "runOn": "always"
     },
     {
-        "runs_on":"windows-2019",
+        "runs_on":"windows-2022",
         "target":"windows",
         "arch": "arm64",
         "binary_extension":".exe-arm64",
diff --git a/.github/matrix_includes_packchk.json b/.github/matrix_includes_packchk.json
index 689f8f8af..2ca54558a 100644
--- a/.github/matrix_includes_packchk.json
+++ b/.github/matrix_includes_packchk.json
@@ -28,14 +28,14 @@
         "binary": "packchk"
     },
     {
-        "runs_on":"windows-2019",
+        "runs_on":"windows-2022",
         "target":"windows",
         "arch": "amd64",
         "runOn": "always",
         "binary": "packchk.exe"
     },
     {
-        "runs_on":"windows-2019",
+        "runs_on":"windows-2022",
         "target":"windows",
         "arch": "arm64",
         "runOn": "always",
diff --git a/.github/matrix_includes_packgen.json b/.github/matrix_includes_packgen.json
index 70c794309..f6109bd55 100644
--- a/.github/matrix_includes_packgen.json
+++ b/.github/matrix_includes_packgen.json
@@ -29,14 +29,14 @@
         "runOn": "always"
     },
     {
-        "runs_on":"windows-2019",
+        "runs_on":"windows-2022",
         "target":"windows",
         "arch": "amd64",
         "binary": "packgen.exe",
         "runOn": "always"
     },
     {
-        "runs_on":"windows-2019",
+        "runs_on":"windows-2022",
         "target":"windows",
         "arch": "arm64",
         "binary": "packgen.exe",
diff --git a/.github/matrix_includes_projmgr.json b/.github/matrix_includes_projmgr.json
index 4029b78fa..228bba7b8 100644
--- a/.github/matrix_includes_projmgr.json
+++ b/.github/matrix_includes_projmgr.json
@@ -36,7 +36,7 @@
         "goswig": false
     },
     {
-        "runs_on":"windows-2019",
+        "runs_on":"windows-2022",
         "target":"windows",
         "arch": "amd64",
         "binary": "csolution.exe",
@@ -45,7 +45,7 @@
         "goswig": false
     },
     {
-        "runs_on":"windows-2019",
+        "runs_on":"windows-2022",
         "target":"windows",
         "arch": "arm64",
         "binary": "csolution.exe",
diff --git a/.github/matrix_includes_svdconv.json b/.github/matrix_includes_svdconv.json
index 44c835511..6d82f7991 100644
--- a/.github/matrix_includes_svdconv.json
+++ b/.github/matrix_includes_svdconv.json
@@ -28,14 +28,14 @@
         "binary": "svdconv"
     },
     {
-        "runs_on":"windows-2019",
+        "runs_on":"windows-2022",
         "target":"windows",
         "arch": "amd64",
         "runOn": "always",
         "binary": "svdconv.exe"
     },
     {
-        "runs_on":"windows-2019",
+        "runs_on":"windows-2022",
         "target":"windows",
         "arch": "arm64",
         "runOn": "always",
diff --git a/.github/matrix_includes_test_libs.json b/.github/matrix_includes_test_libs.json
index 7c8894f62..66b6c4314 100644
--- a/.github/matrix_includes_test_libs.json
+++ b/.github/matrix_includes_test_libs.json
@@ -24,13 +24,13 @@
         "runOn": "always"
     },
     {
-        "runs_on":"windows-2019",
+        "runs_on":"windows-2022",
         "target":"windows",
         "arch": "amd64",
         "runOn": "always"
     },
     {
-        "runs_on":"windows-2019",
+        "runs_on":"windows-2022",
         "target":"windows",
         "arch": "arm64",
         "runOn": "always"