diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 29bb3f8c..778df401 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -9,7 +9,7 @@ jobs:
       matrix:
         config: [Debug, Release]
 
-    runs-on: macos-13
+    runs-on: macos-latest
 
     steps:
     - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
@@ -21,7 +21,7 @@ jobs:
       id: cache-vcpkg
       with:
         path: build/vcpkg_cache/
-        key: vcpkg-binaries-x64-osx
+        key: vcpkg-binaries-arm64-osx
 
     - name: Create Build Environment
       if: ${{ !steps.cache-vcpkg.outputs.cache-hit }}
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 55465a54..559da472 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -3,7 +3,7 @@ name: Windows
 on: [push, pull_request]
 
 jobs:
-  vs2022:
+  vs2026:
     strategy:
       fail-fast: false
       matrix:
@@ -11,7 +11,7 @@ jobs:
         libs: ['shared', 'static']
         config: ['Debug', 'Release']
 
-    runs-on: windows-2022
+    runs-on: windows-latest
 
     steps:
     - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
@@ -49,7 +49,7 @@ jobs:
         $cacheAccess = $(if ('${{ steps.cache-vcpkg.outputs.cache-hit }}' -eq 'true') { 'read' } else { 'write' })
         $env:VCPKG_BINARY_SOURCES = "clear;files,$cachedBinaries,$cacheAccess"
 
-        cmake "-DCMAKE_TOOLCHAIN_FILE=$vcpkgToolchain" "-DVCPKG_TARGET_TRIPLET=$vcpkgTriplet" "-DBUILD_SHARED_LIBS=$cmakeSharedLibs" -G "Visual Studio 17 2022" -A "$msbuildArch" ${{ github.workspace }}
+        cmake "-DCMAKE_TOOLCHAIN_FILE=$vcpkgToolchain" "-DVCPKG_TARGET_TRIPLET=$vcpkgTriplet" "-DBUILD_SHARED_LIBS=$cmakeSharedLibs" -G "Visual Studio 18 2026" -A "$msbuildArch" ${{ github.workspace }}
 
     - name: Build
       working-directory: build/
diff --git a/vcpkg.json b/vcpkg.json
index 7c62b562..fde91b92 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -49,5 +49,5 @@
   "dependencies": [
     "pegtl"
   ],
-  "builtin-baseline": "7aeffc91033ad35cc4e2c152f213a866ec6c11ac"
+  "builtin-baseline": "04a9d8e5212d01ee1dd9478eadd9caade4f8b0d4"
 }