diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
index dd6f07ff96..e44a0826d3 100644
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -1,6 +1,6 @@
 name: 🐛 Bug Report
 description: Submit a bug report to help us improve
-labels: [bug, needs triage]
+labels: [bug, 'status: needs triage']
 body:
   - type: markdown
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/documentation.yml b/.github/ISSUE_TEMPLATE/documentation.yml
index 35d06dccba..9b53ee7b50 100644
--- a/.github/ISSUE_TEMPLATE/documentation.yml
+++ b/.github/ISSUE_TEMPLATE/documentation.yml
@@ -1,6 +1,6 @@
 name: 📚 Documentation
 description: Report an issue related to documentation
-labels: [documentation, needs triage]
+labels: [documentation, 'status: needs triage']
 body:
   - type: markdown
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/feature.yml b/.github/ISSUE_TEMPLATE/feature.yml
index 8147ecddc5..ab894ad7de 100644
--- a/.github/ISSUE_TEMPLATE/feature.yml
+++ b/.github/ISSUE_TEMPLATE/feature.yml
@@ -1,6 +1,6 @@
 name: 💅 Feature design / RFC
 description: Submit a detailed feature request with a concrete proposal, including an exhaustive API / UI design
-labels: [feature, needs triage]
+labels: [feature, 'status: needs triage']
 body:
   - type: markdown
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/proposal.yml b/.github/ISSUE_TEMPLATE/proposal.yml
index 024d1d6811..772d5d0804 100644
--- a/.github/ISSUE_TEMPLATE/proposal.yml
+++ b/.github/ISSUE_TEMPLATE/proposal.yml
@@ -1,6 +1,6 @@
 name: 💥 Proposal
 description: Propose a non-trivial change to Docusaurus
-labels: [proposal, needs triage]
+labels: [proposal, 'status: needs triage']
 body:
   - type: markdown
     attributes:
diff --git a/.github/workflows/tests-windows.yml b/.github/workflows/tests-windows.yml
new file mode 100644
index 0000000000..9ba95f9055
--- /dev/null
+++ b/.github/workflows/tests-windows.yml
@@ -0,0 +1,40 @@
+name: Windows Tests
+
+on:
+  pull_request:
+    branches:
+      - main
+    paths-ignore:
+      - website/**
+
+jobs:
+  windows-test:
+    name: Windows Tests
+    timeout-minutes: 30
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        node: ['14', '16', '17']
+    steps:
+      - name: Support longpaths
+        run: git config --system core.longpaths true
+      - uses: actions/checkout@v2
+      - name: Use Node.js ${{ matrix.node }}
+        uses: actions/setup-node@v2
+        with:
+          node-version: ${{ matrix.node }}
+      - name: Installation
+        run: yarn || yarn || yarn # 3 attempts to avoid timeout errors...
+      - name: Docusaurus Jest Tests
+        run: yarn test
+      - name: Create a deep path
+        # https://github.com/facebook/docusaurus/pull/4899
+        # https://github.com/facebook/docusaurus/issues/5793
+        run: |
+          mkdir -p "website/_dogfooding/_pages tests/deep-file-path-test/bar/foo/bar/foo/bar/foo/bar/foo/bar/foo/bar/foo/bar/foo/bar/foo/bar/foo/bar/foo/bar/foo/bar/foo/bar/foo/bar/foo/bar/foo/bar/foo/bar/foo/bar/foo/bar/foo/bar/foo/bar/foo/bar/foo/bar/foo/bar/foo/bar/foo/bar/foo/bar/foo/bar/foo/bar/foo/bar/foo/bar/foo/bar"
+          cd "$_"
+          echo "# hello" > test-file.md
+      - name: Docusaurus Build
+        run: yarn build:website --locale en
+        env:
+          CI: true
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 1e71dd2c3f..ae26d9d8e8 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -28,33 +28,3 @@ jobs:
         run: yarn test
       - name: TypeCheck website
         run: yarn workspace website tsc
-  windows-test:
-    name: Windows Tests
-    timeout-minutes: 30
-    runs-on: windows-latest
-    strategy:
-      matrix:
-        node: ['14', '16', '17']
-    steps:
-      - name: Support longpaths
-        run: git config --system core.longpaths true
-      - uses: actions/checkout@v2
-      - name: Use Node.js ${{ matrix.node }}
-        uses: actions/setup-node@v2
-        with:
-          node-version: ${{ matrix.node }}
-      - name: Installation
-        run: yarn || yarn || yarn # 3 attempts to avoid timeout errors...
-      - name: Docusaurus Jest Tests
-        run: yarn test
-      - name: Create a deep path
-        # https://github.com/facebook/docusaurus/pull/4899
-        # https://github.com/facebook/docusaurus/issues/5793
-        run: |
-          mkdir -p "website/_dogfooding/_pages tests/deep-file-path-test/bar/foo/bar/foo/bar/foo/bar/foo/bar/foo/bar/foo/bar/foo/bar/foo/bar/foo/bar/foo/bar/foo/bar/foo/bar/foo/bar/foo/bar/foo/bar/foo/bar/foo/bar/foo/bar/foo/bar/foo/bar/foo/bar/foo/bar/foo/bar/foo/bar/foo/bar/foo/bar/foo/bar/foo/bar/foo/bar/foo/bar/foo/bar"
-          cd "$_"
-          echo "# hello" > test-file.md
-      - name: Docusaurus Build
-        run: yarn build:website --locale en
-        env:
-          CI: true