diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index d92ae81d4..bd889544a 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -2,7 +2,7 @@
 name: "\U0001F41B Bug report"
 about: Create a report to help us improve
 title: ""
-labels: kind/bug
+labels: type/bug
 assignees: ''
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/enhancement_request.md b/.github/ISSUE_TEMPLATE/enhancement_request.md
new file mode 100644
index 000000000..fdf436eae
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/enhancement_request.md
@@ -0,0 +1,28 @@
+---
+name: "✨ Enhancement request"
+about: Suggest an improvement to an existing feature
+title: "[Enhancement]"
+labels: type/enhancement
+assignees: ''
+
+---
+
+**Which existing feature or component would you like to improve?**
+<!--
+Name the feature, component, or API (e.g. "Application rollout", "vela CLI output", "CUE template rendering").
+-->
+
+**What is the current limitation or pain point?**
+<!--
+A clear and concise description of what is missing or frustrating today.
+-->
+
+**Describe the improvement you'd like**
+<!--
+A clear and concise description of what you want to happen instead.
+-->
+
+**Additional context**
+<!--
+Add any other context or screenshots about the enhancement request here.
+-->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 3bac1e43c..d7f41b14b 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -2,7 +2,7 @@
 name: "\U0001F680 Feature request"
 about: Suggest an idea for this project
 title: "[Feature]"
-labels: kind/feature
+labels: type/feature
 assignees: ''
 
 ---