diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6ceb537d5..d30ef77cb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,7 +16,7 @@ on:
 
 jobs:
   build:
-    runs-on: windows-2022
+    runs-on: windows-2025-vs2026
     outputs:
       new_version: ${{ steps.versioning.outputs.NEW_VERSION }}
     steps:
diff --git a/Src/BUILDME.txt b/Src/BUILDME.txt
index b9ed47e5b..d4b2fa347 100644
--- a/Src/BUILDME.txt
+++ b/Src/BUILDME.txt
@@ -5,7 +5,7 @@ for other languages.
 The final files (installers, archives) are saved to the Setup\Final folder.
 
 You need the following tools:
-Visual Studio 2022 (Community Edition is enough)
+Visual Studio 2026 (Community Edition is enough)
   - Desktop development with C++ workload
   - Windows 11 SDK (10.0.22621.0) for Desktop C++
   - Visual C++ ATL support
diff --git a/Src/Common.props b/Src/Common.props
index 2a0a2ceee..785797f94 100644
--- a/Src/Common.props
+++ b/Src/Common.props
@@ -34,7 +34,7 @@
       <WarningLevel>Level3</WarningLevel>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
     </ClCompile>
     <Midl>
       <MkTypLibCompatible>false</MkTypLibCompatible>
diff --git a/Src/OpenShell.sln b/Src/OpenShell.sln
index c53d1eb2f..6944fab2f 100644
--- a/Src/OpenShell.sln
+++ b/Src/OpenShell.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.4.33205.214
+# Visual Studio Version 18
+VisualStudioVersion = 18.6.11806.211 stable
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Skins", "Skins", "{409484D8-C0DB-4991-AF03-124128EDEF98}"
 EndProject
diff --git a/Src/Setup/BuildBinaries.bat b/Src/Setup/BuildBinaries.bat
index d375c7666..6811cad06 100644
--- a/Src/Setup/BuildBinaries.bat
+++ b/Src/Setup/BuildBinaries.bat
@@ -8,6 +8,8 @@ md Output
 md Output\x64
 md Output\ARM64
 
+"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -products * -requires Microsoft.Component.MSBuild -property installationName
+
 echo -- Compiling
 
 for /f "usebackq tokens=*" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -products * -requires Microsoft.Component.MSBuild -property installationPath`) do set MSBuildDir=%%i\MSBuild\Current\Bin\