diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 111f646c..dce6469c 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -100,18 +100,13 @@ jobs:
         uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af # ratchet:actions-rs/toolchain@v1
         with:
           toolchain: stable
-      - name: Install wasm target
-        run: rustup target add wasm32-unknown-unknown
       - uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # ratchet:Swatinem/rust-cache@v2
-      - uses: taiki-e/cache-cargo-install-action@5b024fe3a0a2c7f2aaff0e47871acf0d14b07207 # ratchet:taiki-e/cache-cargo-install-action@v1
-        with:
-          tool: wasm-bindgen-cli
       - uses: MinoruSekine/setup-scoop@6435f41324fa55988d8ce5b06bae5cafc75fe045 # ratchet:MinoruSekine/setup-scoop@v4
       - name: Install buf
         run: scoop install buf
       - run: make proto
       - name: Check CI scripts
-        run: make rust_build
+        run: cargo build
   sqlfluff-template:
     name: Lint template with SQLFluff
     runs-on: ubuntu-latest
diff --git a/.github/workflows/release-cli.yml b/.github/workflows/release-cli.yml
index fdb3fdeb..7d570bff 100644
--- a/.github/workflows/release-cli.yml
+++ b/.github/workflows/release-cli.yml
@@ -209,3 +209,31 @@ jobs:
         uses: softprops/action-gh-release@9d7c94cfd0a1f3ed45544c887983e9fa900f0564 # ratchet:softprops/action-gh-release@v2.0.4
         with:
           files: 'quary-*'
+  upload_cli_release_windows:
+    runs-on: windows-latest
+    needs:
+      - check-versions-match
+    steps:
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # ratchet:actions/checkout@v4
+      - name: Install stable toolchain
+        uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af # ratchet:actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+      - uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # ratchet:Swatinem/rust-cache@v2
+      - uses: MinoruSekine/setup-scoop@6435f41324fa55988d8ce5b06bae5cafc75fe045 # ratchet:MinoruSekine/setup-scoop@v4
+      - name: Install buf
+        run: scoop install buf
+      - run: make proto
+      - run: cargo build --release
+      - name: Extract version from tag
+        id: version
+        run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_ENV
+      - name: Package as archive
+        run: |
+          cd target/release
+          zip -j quary-${{ env.VERSION }}-windows-x86_64-gnu.zip quary.exe
+          mv quary-${{ env.VERSION }}-windows-x86_64-gnu.zip ../../
+      - name: Upload Release Asset
+        uses: softprops/action-gh-release@9d7c94cfd0a1f3ed45544c887983e9fa900f0564 # ratchet:softprops/action-gh-release@v2.0.4
+        with:
+          files: 'quary-*'