diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f36ae2b4..576f5bc2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -22,7 +22,7 @@ on:
 jobs:
  Build:
   name:    sfall
-  runs-on: windows-2019
+  runs-on: windows-2022
   steps:
 
   - name: Clone sfall
diff --git a/action.yml b/action.yml
index 72a5e29d..4a6c3468 100644
--- a/action.yml
+++ b/action.yml
@@ -85,6 +85,17 @@ runs:
           echo "dir=$(cygpath --windows "$DXSDK_DIR/DXSDK_Jun2010/")" >> $GITHUB_OUTPUT
    shell: bash
 
+ # Install VS 2015 C++ build tools and WinXP Support components via Chocolatey
+ - name:  Prepare VS 2015 C++ build tools
+   id:    vs2015_tools
+   run:   |
+          echo "::group::Prepare VS 2015 C++ build tools"
+
+          choco install visualstudio2017buildtools --package-parameters "--add Microsoft.VisualStudio.Workload.VCTools --add Microsoft.VisualStudio.Workload.MSBuildTools --add Microsoft.VisualStudio.Component.VC.140 --add Microsoft.VisualStudio.Component.WinXP --add Microsoft.VisualStudio.ComponentGroup.NativeDesktop.WinXP --passive"
+
+          echo "::endgroup::"
+   shell: bash
+
  # MSBuild is not in PATH on Windows machines
  # Using $GITHUB_OUTPUT to make sure workflow environment remains unchanged
  - name:  Prepare MSBuild