diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index e19998b74f6a2..3dddde66cae05 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -17,7 +17,7 @@
 
 name: Bug Report
 description: File a bug report
-labels: ["Type: bug"]
+type: Bug
 assignees: []
 body:
   - type: textarea
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml
index 2f6e9970e4238..aa108779f2231 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yaml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yaml
@@ -17,7 +17,7 @@
 
 name: Enhancement Request
 description: Request an enhancement to the project
-labels: ["Type: enhancement"]
+type: Feature
 assignees: []
 body:
   - type: markdown