diff --git a/.github/ISSUE_TEMPLATE/research.yml b/.github/ISSUE_TEMPLATE/research.yml
index 3121ee3f0bf..48694ecaf83 100644
--- a/.github/ISSUE_TEMPLATE/research.yml
+++ b/.github/ISSUE_TEMPLATE/research.yml
@@ -1,6 +1,6 @@
 name: Research
 description: Request an investigation into a specific topic
-labels: ["research", "0 - new", "needs triage"]
+labels: ["spike", "0 - new", "needs triage"]
 body:
   - type: markdown
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/test.yml b/.github/ISSUE_TEMPLATE/test.yml
index 6599fb8753d..1f550218e97 100644
--- a/.github/ISSUE_TEMPLATE/test.yml
+++ b/.github/ISSUE_TEMPLATE/test.yml
@@ -1,6 +1,6 @@
 name: Test
 description: Associate issue for a test (e.g., a new test, an unstable test that was skipped, Chromatic, etc.)
-labels: ["testing", "0 - new", "p - high"]
+labels: ["testing", "0 - new", "p - high", "needs milestone"]
 body:
   - type: markdown
     attributes: