diff --git a/.github/ISSUE_TEMPLATE/01_bug_ai.yml b/.github/ISSUE_TEMPLATE/01_bug_ai.yml
index 36e9036b78..8d977f4f7a 100644
--- a/.github/ISSUE_TEMPLATE/01_bug_ai.yml
+++ b/.github/ISSUE_TEMPLATE/01_bug_ai.yml
@@ -1,7 +1,7 @@
 name: Bug Report (AI)
 description: Zed Agent Panel Bugs
 type: "Bug"
-labels: ["ai"]
+labels: ["area:ai"]
 title: "AI: <a short description of the AI Related bug>"
 body:
   - type: textarea
diff --git a/.github/ISSUE_TEMPLATE/04_bug_debugger.yml b/.github/ISSUE_TEMPLATE/04_bug_debugger.yml
index 8361de5c22..3191227371 100644
--- a/.github/ISSUE_TEMPLATE/04_bug_debugger.yml
+++ b/.github/ISSUE_TEMPLATE/04_bug_debugger.yml
@@ -1,7 +1,7 @@
 name: Bug Report (Debugger)
 description: Zed Debugger-Related Bugs
 type: "Bug"
-labels: ["debugger"]
+labels: ["area:debugger"]
 title: "Debugger: <a short description of the Debugger bug>"
 body:
   - type: textarea
diff --git a/.github/ISSUE_TEMPLATE/06_bug_git.yml b/.github/ISSUE_TEMPLATE/06_bug_git.yml
index ec6276df3a..e0b6a67508 100644
--- a/.github/ISSUE_TEMPLATE/06_bug_git.yml
+++ b/.github/ISSUE_TEMPLATE/06_bug_git.yml
@@ -1,7 +1,7 @@
 name: Bug Report (Git)
 description: Zed Git Related Bugs
 type: "Bug"
-labels: ["git"]
+labels: ["area:integrations/git"]
 title: "Git: <a short description of the Git bug>"
 body:
   - type: textarea
diff --git a/.github/ISSUE_TEMPLATE/07_bug_windows.yml b/.github/ISSUE_TEMPLATE/07_bug_windows.yml
index b4bda930dc..7f48890eb9 100644
--- a/.github/ISSUE_TEMPLATE/07_bug_windows.yml
+++ b/.github/ISSUE_TEMPLATE/07_bug_windows.yml
@@ -1,7 +1,7 @@
 name: Bug Report (Windows)
 description: Zed Windows Related Bugs
 type: "Bug"
-labels: ["windows"]
+labels: ["platform:windows"]
 title: "Windows: <a short description of the Windows bug>"
 body:
   - type: textarea