diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml
index 9bb99c69f..d3dbe4435 100644
--- a/.github/workflows/win.yml
+++ b/.github/workflows/win.yml
@@ -5,7 +5,7 @@ on:
 
 jobs:
   windows:
-    runs-on: ci-windows-github-1
+    runs-on: windows-latest
     name: Windows (${{ matrix.name || matrix.shard}})
     strategy:
       fail-fast: false # don't abort the entire matrix if one element fails
@@ -66,10 +66,7 @@ jobs:
           Remove-Item -Force
 
   win-tool-go:
-    # windows-8vpu is a 2022 GitHub-managed runner in our
-    # org with 8 cores and 32 GB of RAM:
-    # https://github.com/organizations/tailscale/settings/actions/github-hosted-runners/1
-    runs-on: windows-8vcpu
+    runs-on: windows-latest
     name: Windows (win-tool-go)
     steps:
     - name: checkout