diff --git a/.github/ISSUE_TEMPLATE/01_bug_ai.yml b/.github/ISSUE_TEMPLATE/01_bug_ai.yml
index 36e9036b7840fb536bfc47f1fd9b8359c6736b61..8d977f4f7ae603f0b2ed991ce6dabee25e045f06 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 8361de5c22fe27a8ea2dd9597fdcbcbf6cd9661e..3191227371a544b3ad6232c204b85afd5c6a238a 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 ec6276df3a21b8df6fde5e6f49d868dee329d864..e0b6a6750879bf8de41a942e1057b9e4d5cdcc91 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 b4bda930dc81c13224956e0e2cb75ecb26f9e2f5..7f48890eb961aa35dbae70cc22829ba6cb0e2a77 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