diff --git a/.github/workflows/wash.yml b/.github/workflows/wash.yml
index 5eec764b55..799b264938 100644
--- a/.github/workflows/wash.yml
+++ b/.github/workflows/wash.yml
@@ -41,7 +41,7 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: '18.x'
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v4.1.1
       - uses: Swatinem/rust-cache@v2
         with:
           shared-key: "${{ matrix.os }}-shared-cache"
diff --git a/.github/workflows/wasmcloud.yml b/.github/workflows/wasmcloud.yml
index c9ed4d271e..066d15a3fd 100644
--- a/.github/workflows/wasmcloud.yml
+++ b/.github/workflows/wasmcloud.yml
@@ -52,13 +52,14 @@ jobs:
             file ./result/bin/wasmcloud
           test-oci: docker load < ./result
 
-        - target: x86_64-pc-windows-gnu
-          test-bin: |
-            nix profile install --inputs-from . 'nixpkgs#wine64'
-            wine64 ./result/bin/wash.exe --version
-            wine64 ./result/bin/wasmcloud.exe --version
-          test-oci: docker load < ./result
-          # TODO: Run win64 binary within OCI
+        # TODO: Build for GNU once https://github.com/rust-lang/rust/issues/92212 is resolved
+        #- target: x86_64-pc-windows-gnu
+        #  test-bin: |
+        #    nix profile install --inputs-from . 'nixpkgs#wine64'
+        #    wine64 ./result/bin/wash.exe --version
+        #    wine64 ./result/bin/wasmcloud.exe --version
+        #  test-oci: docker load < ./result
+        #  # TODO: Run win64 binary within OCI
 
         - target: x86_64-unknown-linux-musl
           test-bin: |
@@ -84,6 +85,20 @@ jobs:
         package: wasmcloud-${{ matrix.config.target }}-oci
     - run: ${{ matrix.config.test-oci }}
 
+  build-windows:
+    name: wasmcloud-x86_64-pc-windows-msvc
+    runs-on: windows-latest-8-cores
+    steps: 
+    - uses: actions/checkout@v4.1.1
+    - run: cargo build --release --workspace
+    - run: mkdir -p ./bin
+    - run: mv ./target/release/wasmcloud.exe ./bin/wasmcloud.exe
+    - run: mv ./target/release/wash.exe ./bin/wash.exe
+    - uses: actions/upload-artifact@v3
+      with:
+        name: wasmcloud-x86_64-pc-windows-msvc
+        path: bin
+
   build-lipo:
     name: wasmcloud-universal-darwin
     needs: build-bin
@@ -127,11 +142,12 @@ jobs:
 
   test-windows:
     runs-on: windows-2022
-    needs: build-bin
+    needs: build-windows
     steps:
     - uses: actions/download-artifact@v3
       with:
-        name: wasmcloud-x86_64-pc-windows-gnu
+        name: wasmcloud-x86_64-pc-windows-msvc
+    - run: .\bin\wash.exe --version
     - run: .\bin\wasmcloud.exe --version
 
   cargo:
diff --git a/Dockerfile b/Dockerfile
index c9f941772c..2704ab9cc8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,6 @@ RUN case ${TARGETPLATFORM} in \
     "darwin/arm64")  TARGET="aarch64-apple-darwin" ;; \
     "linux/amd64")   TARGET="x86_64-unknown-linux-musl" ;; \
     "linux/arm64")   TARGET="aarch64-unknown-linux-musl" ;; \
-    "windows/amd64") TARGET="x86_64-pc-windows-gnu" ;; \
     *) \
     echo "ERROR: TARGETPLATFORM '${TARGETPLATFORM}' not supported." \
     exit 1 \
diff --git a/crates/wash-cli/Dockerfile b/crates/wash-cli/Dockerfile
index d74b593def..9d725c23b2 100644
--- a/crates/wash-cli/Dockerfile
+++ b/crates/wash-cli/Dockerfile
@@ -10,7 +10,6 @@ RUN case ${TARGETPLATFORM} in \
     "darwin/arm64")  TARGET="aarch64-apple-darwin" ;; \
     "linux/amd64")   TARGET="x86_64-unknown-linux-musl" ;; \
     "linux/arm64")   TARGET="aarch64-unknown-linux-musl" ;; \
-    "windows/amd64") TARGET="x86_64-pc-windows-gnu" ;; \
     *) \
     echo "ERROR: TARGETPLATFORM '${TARGETPLATFORM}' not supported." \
     exit 1 \