diff --git a/.github/matrix_includes_buildmgr.json b/.github/matrix_includes_buildmgr.json
index 3ea27ab2e..e9286e74b 100644
--- a/.github/matrix_includes_buildmgr.json
+++ b/.github/matrix_includes_buildmgr.json
@@ -40,7 +40,7 @@
         "runOn": "always"
     },
     {
-        "runs_on":"windows-2022",
+        "runs_on":"windows-11-vs2026-arm",
         "target":"windows",
         "arch": "arm64",
         "binary_extension":".exe-arm64",
diff --git a/.github/matrix_includes_ctrace.json b/.github/matrix_includes_ctrace.json
index 38b83e13e..b352c6aa0 100644
--- a/.github/matrix_includes_ctrace.json
+++ b/.github/matrix_includes_ctrace.json
@@ -28,7 +28,7 @@
         "runOn": "always"
     },
     {
-        "runs_on":"windows-2022",
+        "runs_on":"windows-11-vs2026-arm",
         "target":"windows",
         "arch": "arm64",
         "binary": "ctrace.exe",
diff --git a/.github/matrix_includes_packchk.json b/.github/matrix_includes_packchk.json
index 5417d7259..341b097c7 100644
--- a/.github/matrix_includes_packchk.json
+++ b/.github/matrix_includes_packchk.json
@@ -28,7 +28,7 @@
         "binary": "packchk.exe"
     },
     {
-        "runs_on":"windows-2022",
+        "runs_on":"windows-11-vs2026-arm",
         "target":"windows",
         "arch": "arm64",
         "runOn": "always",
diff --git a/.github/matrix_includes_packgen.json b/.github/matrix_includes_packgen.json
index baa6a125f..1f60f7799 100644
--- a/.github/matrix_includes_packgen.json
+++ b/.github/matrix_includes_packgen.json
@@ -28,7 +28,7 @@
         "runOn": "always"
     },
     {
-        "runs_on":"windows-2022",
+        "runs_on":"windows-11-vs2026-arm",
         "target":"windows",
         "arch": "arm64",
         "binary": "packgen.exe",
diff --git a/.github/matrix_includes_projmgr.json b/.github/matrix_includes_projmgr.json
index e79e5bef7..05f81681b 100644
--- a/.github/matrix_includes_projmgr.json
+++ b/.github/matrix_includes_projmgr.json
@@ -36,7 +36,7 @@
         "goswig": false
     },
     {
-        "runs_on":"windows-2022",
+        "runs_on":"windows-11-vs2026-arm",
         "target":"windows",
         "arch": "arm64",
         "binary": "csolution.exe",
diff --git a/.github/matrix_includes_svdconv.json b/.github/matrix_includes_svdconv.json
index 97da5632a..b4bb383d9 100644
--- a/.github/matrix_includes_svdconv.json
+++ b/.github/matrix_includes_svdconv.json
@@ -28,7 +28,7 @@
         "binary": "svdconv.exe"
     },
     {
-        "runs_on":"windows-2022",
+        "runs_on":"windows-11-vs2026-arm",
         "target":"windows",
         "arch": "arm64",
         "runOn": "always",
diff --git a/.github/matrix_includes_test_libs.json b/.github/matrix_includes_test_libs.json
index 64357b9f5..d0ab681f1 100644
--- a/.github/matrix_includes_test_libs.json
+++ b/.github/matrix_includes_test_libs.json
@@ -24,7 +24,7 @@
         "runOn": "always"
     },
     {
-        "runs_on":"windows-2022",
+        "runs_on":"windows-11-vs2026-arm",
         "target":"windows",
         "arch": "arm64",
         "runOn": "always"
diff --git a/.github/workflows/projmgr.yml b/.github/workflows/projmgr.yml
index 3469448cd..57127808e 100644
--- a/.github/workflows/projmgr.yml
+++ b/.github/workflows/projmgr.yml
@@ -161,7 +161,7 @@ jobs:
 
       - uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
         with:
-          python-version: '3.13.3'
+          python-version: '3.13'
 
       - name: Build swig python libs
         if: matrix.pyswig