diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 40f276a373..7ddc38c358 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,7 +1,6 @@
 name: Bug report 🐛
 description: Report a bug
-title: "fix: <insert descriptive title here>"
-labels: ["bug", "triage"]
+labels: ["category.bug", "status.needs-triage"]
 body:
   - type: markdown
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index 5acb1890e5..6a0c5f411f 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,7 +1,6 @@
 name: Feature request 💡
 description: Request a feature
-title: "feat: <insert descriptive title here>"
-labels: ["feat", "triage"]
+labels: ["category.enhancement", "status.needs-triage"]
 body:
   - type: markdown
     attributes: