diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 8f14d1eed..1195a2711 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -146,7 +146,7 @@ jobs:
     runs-on: ${{matrix.os}}
     strategy:
       matrix:
-        os: [ubuntu-20.04, windows-latest, macos-latest]
+        os: [ubuntu-20.04, windows-2022, macos-latest]
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v4
@@ -275,13 +275,12 @@ jobs:
           version: "v1.9.0"
 
   Release:
-    needs:
-      [
+    needs: [
         native-build-cli,
         build-deb-testnet,
         build-deb-mainnet,
         MacOS-ARM64-CLI,
-        check-hw-tool
+        check-hw-tool,
         # check-hw-tool-mainnet
       ]
     runs-on: ubuntu-20.04
@@ -311,9 +310,9 @@ jobs:
       - uses: actions/download-artifact@v3
         with:
           name: check_hw_${{ steps.get_version.outputs.VERSION }}.tar.gz
-#      - uses: actions/download-artifact@v3
-#        with:
-#          name: check_hw_${{ steps.get_version.outputs.VERSION }}_mainnet.tar.gz
+      #      - uses: actions/download-artifact@v3
+      #        with:
+      #          name: check_hw_${{ steps.get_version.outputs.VERSION }}_mainnet.tar.gz
       - name: Release
         uses: softprops/action-gh-release@v1
         with:
@@ -326,4 +325,5 @@ jobs:
             secretcli-Linux
             secretcli-MacOS-arm64
             check_hw_${{ steps.get_version.outputs.VERSION }}.tar.gz
-#            check_hw_${{ steps.get_version.outputs.VERSION }}_mainnet.tar.gz
\ No newline at end of file
+
+#            check_hw_${{ steps.get_version.outputs.VERSION }}_mainnet.tar.gz
diff --git a/cosmwasm/.github/workflows/ci.yml b/cosmwasm/.github/workflows/ci.yml
index 43cf6ca90..2b9af33b1 100644
--- a/cosmwasm/.github/workflows/ci.yml
+++ b/cosmwasm/.github/workflows/ci.yml
@@ -22,7 +22,7 @@ jobs:
           - build: macOS
             os: macOS-latest
           - build: Windows
-            os: windows-latest
+            os: windows-2022
     defaults:
       run:
         shell: bash