diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index bae4d942e..717c1f09a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -31,9 +31,9 @@ jobs:
           - {os: macOS-latest, r: 'devel'}
           - {os: macOS-latest, r: 'release'}
           - {os: macOS-latest, r: 'oldrel'}
-          #- {os: windows-latest, r: 'devel'}
-          #- {os: windows-latest, r: 'release'}
-          #- {os: windows-latest, r: 'oldrel'}
+          - {os: windows-latest, r: 'devel'}
+          - {os: windows-latest, r: 'release'}
+          - {os: windows-latest, r: 'oldrel'}
           - {os: ubuntu-latest, r: 'devel'}
           - {os: ubuntu-latest, r: 'release'}
           - {os: ubuntu-latest, r: 'oldrel'}
@@ -47,10 +47,6 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Duplicate StanHeaders to avoid issues with cleanup running twice
-        run: cp -r StanHeaders StanHeaders2
-        shell: bash
-
       - uses: r-lib/actions/setup-r@v2
         with:
           r-version: ${{ matrix.config.r }}
@@ -59,9 +55,15 @@ jobs:
 
       - uses: r-lib/actions/setup-r-dependencies@v2
         with:
-          working-directory: StanHeaders2
+          working-directory: StanHeaders
           extra-packages: any::rcmdcheck, local::.
 
+      - name: Revert all changes due to cleanup
+        run: |
+          git reset --hard
+          git clean -fd
+        shell: bash
+
       - uses: r-lib/actions/check-r-package@v2
         with:
           working-directory: StanHeaders
@@ -71,6 +73,8 @@ jobs:
       - uses: r-lib/actions/setup-r-dependencies@v2
         with:
           working-directory: rstan/rstan
+          # StanHeaders installed earlier
+          extra-packages: StanHeaders=?ignore
 
       - uses: r-lib/actions/check-r-package@v2
         with: