diff --git a/.github/actions/setup-bun/action.yml b/.github/actions/setup-bun/action.yml
index 7584334a7..65fbf0f3d 100644
--- a/.github/actions/setup-bun/action.yml
+++ b/.github/actions/setup-bun/action.yml
@@ -6,7 +6,7 @@ runs:
     - name: Mount Bun Cache
       uses: useblacksmith/stickydisk@v1
       with:
-        key: ${{ github.repository }}-bun-cache
+        key: ${{ github.repository }}-bun-cache-${{ runner.os }}
         path: ~/.bun
 
     - name: Setup Bun
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2a36c07e1..ae08c1ed6 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -22,7 +22,7 @@ jobs:
               git config --global user.name "opencode"
               bun turbo test
           - name: windows
-            host: windows-latest
+            host: blacksmith-4vcpu-windows-2025
             playwright: bunx playwright install
             workdir: packages/app
             command: bun test:e2e:local