diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index aceee29688..7d9e640137 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,8 +1,8 @@
 name: Bug report
 description: Create a report to help us improve
+type: "bug"
 labels:
   - kind/bug
-  - status/0-triage
 body:
   - type: markdown
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index 677a1684fc..7494abb1e2 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,8 +1,8 @@
 name: Feature request
 description: Missing functionality? Come tell us about it!
+type: "enhancement"
 labels:
   - kind/feature
-  - status/0-triage
 body:
   - type: textarea
     id: description