diff --git a/.github/actions/windows-build/action.yml b/.github/actions/windows-build/action.yml
index 2266b1064a..a447c7f91c 100644
--- a/.github/actions/windows-build/action.yml
+++ b/.github/actions/windows-build/action.yml
@@ -37,10 +37,10 @@ runs:
         cd cpp
         mkdir build-win
         cd build-win
-        if min==${{ inputs.version }} (
+        if "${{ inputs.version }}"=="min" (
           call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64
         ) else (
-          call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64
+          call "C:\Program Files\Microsoft Visual Studio\18\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64
         )
         cmake --version
         cmake -G "Ninja" -DCMAKE_BUILD_TYPE=${{ inputs.config }} -DMEMILIO_USE_BUNDLED_JSONCPP=${{ inputs.optional-dependencies }} -DHDF5_USE_STATIC_LIBRARIES=ON -DHDF5_DIR="C:\HDF5\cmake" ..
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8cc1ae158f..94e4fcaeea 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -101,7 +101,7 @@ jobs:
         version: ["latest", "min"]
         include:
           - version: "latest"
-            os: "windows-2025"
+            os: "windows-2025-vs2026"
           - version: "min"
             os: "windows-2022"
     runs-on: ${{ matrix.os }}
@@ -114,7 +114,7 @@ jobs:
 
   build-cpp-msvc-no-optional-deps:
     if: github.event.pull_request.draft == false
-    runs-on: windows-2025
+    runs-on: windows-2025-vs2026
     steps:
       - uses: actions/checkout@v6
       - uses: ./.github/actions/windows-build
@@ -231,7 +231,7 @@ jobs:
         version: ["latest", "min"]
         include:
           - version: "latest"
-            os: "windows-2025"
+            os: "windows-2025-vs2026"
           - version: "min"
             os: "windows-2022"
     runs-on: ${{ matrix.os }}
@@ -244,7 +244,7 @@ jobs:
   test-cpp-msvc-no-optional-deps:
     if: github.event.pull_request.draft == false
     needs: build-cpp-msvc-no-optional-deps
-    runs-on: windows-2025
+    runs-on: windows-2025-vs2026
     steps:
       - uses: actions/checkout@v6
       - uses: ./.github/actions/windows-test
@@ -295,7 +295,7 @@ jobs:
         version: ["latest", "min"]
         include:
           - version: "latest"
-            os: "windows-2025"
+            os: "windows-2025-vs2026"
           - version: "min"
             os: "windows-2022"
     runs-on: ${{ matrix.os }}
diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml
index 81d32b0dba..7056e46bbb 100644
--- a/.github/workflows/pypi.yml
+++ b/.github/workflows/pypi.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-latest, windows-2025-vs2026]
 
     steps:
       - uses: actions/checkout@v6
diff --git a/cpp/README.md b/cpp/README.md
index 9583300592..1c7877076e 100644
--- a/cpp/README.md
+++ b/cpp/README.md
@@ -20,7 +20,7 @@ MEmilio C++ uses CMake as a build configuration system (https://cmake.org/)
 MEmilio C++ is regularly tested with the following compilers (list will be extended over time):
 - GCC, versions 11 and 13
 - Clang, version 14 and 17
-- MSVC, version 19.43 (Visual Studio 2022)
+- MSVC, versions 19.44+ (Visual Studio 2022) and 19.51+ (Visual Studio 2026)
 
 MEmilio C++ is regularly tested on gitlub runners using Ubuntu 22.04 and 24.04 and Windows Server 2022 and 2025. It is expected to run on any comparable Linux or Windows system. It is currently not tested on MacOS.
 
diff --git a/docs/source/cpp/installation.rst b/docs/source/cpp/installation.rst
index 2753d433e6..44a6e87681 100644
--- a/docs/source/cpp/installation.rst
+++ b/docs/source/cpp/installation.rst
@@ -32,7 +32,7 @@ MEmilio C++ is regularly tested with the following compilers (list will be exten
 
 - GCC, versions 11 and 13
 - Clang, version 14 and 17
-- MSVC, version 19.43 (Visual Studio 2022)
+- MSVC, versions 19.44+ (Visual Studio 2022) and 19.51+ (Visual Studio 2026)
 
 MEmilio C++ is regularly tested on GitHub runners using Ubuntu 22.04 and 24.04 and Windows Server 2022 and 2025. It is
 expected to run on any comparable Linux or Windows system. It is currently not tested on macOS.