diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9db097614..6f9f26fa2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -63,11 +63,11 @@ jobs:
         configurations: [Debug, Release]
         target: [tests, library]
       fail-fast: false
-    runs-on: windows-2025
+    runs-on: windows-latest
     env:
       MATRIX_TARGET: ${{ matrix.target }}
       BUILD_CONFIGURATION: ${{ matrix.configurations }}
-      CMAKE_GENERATOR: "Visual Studio 17 2022"
+      CMAKE_GENERATOR: "Visual Studio 18 2026"
     steps:
       - uses: actions/checkout@v6
         with:
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index ab77eb123..08e99a153 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-2025]
+        os: [ubuntu-latest, macos-latest, windows-latest]
 
     steps:
       - uses: actions/checkout@v6
@@ -53,7 +53,7 @@ jobs:
         if: runner.os == 'Windows'
         shell: pwsh
         run: >
-          cmake -S . -B build -G "Visual Studio 17 2022"
+          cmake -S . -B build -G "Visual Studio 18 2026"
           -D prevail_ENABLE_TESTS=OFF
 
       # 3. Build
diff --git a/cmake/SetupYAMLCPP.cmake b/cmake/SetupYAMLCPP.cmake
index 207054a93..e0c8d8c41 100644
--- a/cmake/SetupYAMLCPP.cmake
+++ b/cmake/SetupYAMLCPP.cmake
@@ -19,7 +19,7 @@ if (NOT TARGET yaml-cpp::yaml-cpp)
 
     FetchContent_Declare(yaml-cpp
       GIT_REPOSITORY https://github.com/jbeder/yaml-cpp.git
-      GIT_TAG 0.8.0
+      GIT_TAG yaml-cpp-0.9.0
       GIT_SHALLOW TRUE
       FIND_PACKAGE_ARGS NAMES yaml-cpp
     )