diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 969f71e323..867016975f 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -54,12 +54,17 @@ jobs:
           triplet: ${{ matrix.triplet }}
           token: ${{ github.token }}
 
+      - name: Set up VS
+        uses: ilammy/msvc-dev-cmd@v1
+        with:
+          arch: ${{ matrix.arch }}
+
       - name: Configure CMake
         run: |
           cmake `
+            -G Ninja `
             -B ${{github.workspace}}/${{ matrix.buildloc }} `
             -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} `
-            -DCMAKE_GENERATOR_PLATFORM=${{ matrix.platform }} `
             -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake `
             -DHTTP_API_DIR="C:\\${{ matrix.programfiles }}\\Mosquitto\\dashboard" `
             -DVCPKG_MANIFEST_MODE=ON `
@@ -80,6 +85,7 @@ jobs:
       - name: Installer
         uses: joncloud/makensis-action@v5.0
         with:
+          arguments: "/V4"
           script-file: ${{github.workspace}}/installer/${{ matrix.nsis }}
 
       - name: Upload installer to artifacts
diff --git a/installer/mosquitto.nsi b/installer/mosquitto.nsi
index 653a0d9e70..d08807af9b 100644
--- a/installer/mosquitto.nsi
+++ b/installer/mosquitto.nsi
@@ -184,9 +184,9 @@ SectionEnd
 
 Section "Visual Studio Runtime"
   SetOutPath "$INSTDIR"
-  File "VC_redist.x86.exe"
-  ExecWait '"$INSTDIR\VC_redist.x86.exe" /quiet /norestart'
-  Delete "$INSTDIR\VC_redist.x86.exe"
+  File "vc_redist.x86.exe"
+  ExecWait '"$INSTDIR\vc_redist.x86.exe" /quiet /norestart'
+  Delete "$INSTDIR\vc_redist.x86.exe"
 SectionEnd
 
 Section "Service" SecService
diff --git a/installer/mosquitto64.nsi b/installer/mosquitto64.nsi
index caee3fddf7..853128285c 100644
--- a/installer/mosquitto64.nsi
+++ b/installer/mosquitto64.nsi
@@ -185,9 +185,9 @@ SectionEnd
 
 Section "Visual Studio Runtime"
   SetOutPath "$INSTDIR"
-  File "VC_redist.x64.exe"
-  ExecWait '"$INSTDIR\VC_redist.x64.exe" /quiet /norestart'
-  Delete "$INSTDIR\VC_redist.x64.exe"
+  File "vc_redist.x64.exe"
+  ExecWait '"$INSTDIR\vc_redist.x64.exe" /quiet /norestart'
+  Delete "$INSTDIR\vc_redist.x64.exe"
 SectionEnd
 
 Section "Service" SecService