diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
index 07b0c6abeb839..63f3d93eb89e8 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -1,7 +1,7 @@
 name: 🐛 Bug Report
 description: File a bug report
 title: "[🐛 Bug]: "
-labels: [ bug, needs-triaging ]
+labels: [ I-defect, needs-triaging ]
 body:
   - type: markdown
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/feature_proposal.yml b/.github/ISSUE_TEMPLATE/feature_proposal.yml
index fc843a7df2d1c..04a8a21d7b541 100644
--- a/.github/ISSUE_TEMPLATE/feature_proposal.yml
+++ b/.github/ISSUE_TEMPLATE/feature_proposal.yml
@@ -1,7 +1,7 @@
 name: 🚀 Feature Proposal
 description: Propose a feature
 title: "[🚀 Feature]: "
-labels: [ feature, needs-triaging ]
+labels: [ I-enhancement, needs-triaging ]
 body:
   - type: markdown
     attributes: