diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index b23ea5706c..b68748a936 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,8 +1,8 @@
 name: 'Bug Report'
 description: 'Report a bug to help us improve Gemini CLI'
 labels:
-  - 'kind/bug'
   - 'status/need-triage'
+type: Bug
 body:
   - type: 'markdown'
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index 1f7e48d4d4..980da0c7a0 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,8 +1,8 @@
 name: 'Feature Request'
 description: 'Suggest an idea for this project'
 labels:
-  - 'kind/enhancement'
   - 'status/need-triage'
+type: Feature
 body:
   - type: 'markdown'
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/website_issue.yml b/.github/ISSUE_TEMPLATE/website_issue.yml
index 8b5b8af912..02146381ab 100644
--- a/.github/ISSUE_TEMPLATE/website_issue.yml
+++ b/.github/ISSUE_TEMPLATE/website_issue.yml
@@ -1,8 +1,7 @@
 name: 'Website issue'
 description: 'Report an issue with the Gemini CLI Website and Gemini CLI Extensions Gallery'
 labels:
-  - 'area/website'
-  - 'status/need-triage'
+  - 'area/extensions'
 body:
   - type: 'markdown'
     attributes: