diff --git a/.github/workflows/do_build.yml b/.github/workflows/do_build.yml
index 2985111..3dbc267 100644
--- a/.github/workflows/do_build.yml
+++ b/.github/workflows/do_build.yml
@@ -36,7 +36,7 @@ env:
 jobs:
   build:
     name:  ${{ inputs.BuildPkg == 'script' && 'Run Script' || 'Build Package' }} - ${{matrix.Configuration}}
-    runs-on: windows-2022
+    runs-on: windows-latest
     environment: main
     outputs:
       ScriptRes: ${{ steps.script_step.outputs.ScriptRes }}
@@ -103,6 +103,7 @@ jobs:
         with:
           path: ${{env.WLB_BASE_FOLDER}}
           key: gnulib-bare
+          enableCrossOsArchive: true
 
       - name: MSBuild Setup
         uses: microsoft/setup-msbuild@v1.1.3
diff --git a/.github/workflows/gnulib_tests.yml b/.github/workflows/gnulib_tests.yml
index 349165d..0ecf9ed 100644
--- a/.github/workflows/gnulib_tests.yml
+++ b/.github/workflows/gnulib_tests.yml
@@ -24,18 +24,19 @@ jobs:
       Script: .github/gnu_patchtest.sh gnulib_dump_patches
       NoDebugBuild: true
   gnulib_source_cache:
-    runs-on: windows-2022
+    runs-on: windows-latest
     defaults:
         run:
           shell: pwsh
     steps:
-      - name: clone srcs
+      - name: clone src
         run: git clone --bare git://git.sv.gnu.org/gnulib.git d:/WLB/gnulib.git
       - name: Cache gnulib bare repo
         uses: actions/cache/save@v4
         with:
           path: d:/WLB/gnulib.git
           key: gnulib-bare
+          enableCrossOsArchive: true
 
   gnulib_test_all_patches:
     name: Test All Patches Together
diff --git a/.github/workflows/restore_deps_to_cache.yml b/.github/workflows/restore_deps_to_cache.yml
index 251f0e6..e09be21 100644
--- a/.github/workflows/restore_deps_to_cache.yml
+++ b/.github/workflows/restore_deps_to_cache.yml
@@ -22,7 +22,7 @@ jobs:
         Configuration: [Debug, Release]
 
     name:  DEP Download
-    runs-on: windows-2022
+    runs-on: windows-latest
     environment: main
     defaults:
       run: