diff --git a/.github/workflows/ci-downstream.yml b/.github/workflows/ci-downstream.yml
index a103283..a626205 100644
--- a/.github/workflows/ci-downstream.yml
+++ b/.github/workflows/ci-downstream.yml
@@ -24,7 +24,7 @@ jobs:
           },
           {
             "match-jobs": ["windows-*"],
-            "winget-install": ["EclipseFoundation.Mosquitto"]
+            "run": "$ErrorActionPreference='Stop'; Invoke-WebRequest -Uri 'https://mosquitto.org/files/binary/win64/mosquitto-2.0.18-install-windows-x64.exe' -OutFile mosq.exe; Start-Process -FilePath ./mosq.exe -ArgumentList '/S' -Wait; Start-Service mosquitto"
           },
           {
             "match-jobs": ["macos-*"],
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f3726a6..f140a48 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,13 +19,13 @@ jobs:
           - os: ubuntu-latest
             generator: Ninja
             build_type: Debug
-          - os: windows-latest
+          - os: windows-2022
             generator: "Visual Studio 17 2022"
             build_type: Debug
           - os: ubuntu-latest
             generator: Ninja
             build_type: Release
-          - os: windows-latest
+          - os: windows-2022
             generator: "Visual Studio 17 2022"
             build_type: Release
 
@@ -69,13 +69,13 @@ jobs:
           - os: ubuntu-latest
             generator: Ninja
             build_type: Debug
-          - os: windows-latest
+          - os: windows-2022
             generator: "Visual Studio 17 2022"
             build_type: Debug
           - os: ubuntu-latest
             generator: Ninja
             build_type: Release
-          - os: windows-latest
+          - os: windows-2022
             generator: "Visual Studio 17 2022"
             build_type: Release
 
@@ -122,7 +122,7 @@ jobs:
           cmake --install build/output --config "${{ matrix.build_type }}"
 
       - name: Add DLL path (Windows only)
-        if: matrix.os == 'windows-latest'
+        if: matrix.os == 'windows-2022'
         run: echo "${{ env.INSTALL_PREFIX }}/lib" >> $env:GITHUB_PATH
 
       - name: Configure project with CMake