diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index c089cc86..63bf5eac 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -2,7 +2,7 @@
 name: Bug report
 about: Topgrade is misbehaving
 title: ''
-labels: 'C-bug'
+type: Bug
 assignees: ''
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 88d546f4..bee4a395 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -2,7 +2,7 @@
 name: General feature request
 about: Suggest a general feature, or feature within an already existing step
 title: ''
-labels: C-feature request
+type: Feature
 assignees: ''
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/step_request.md b/.github/ISSUE_TEMPLATE/step_request.md
index 6969f976..f7c37bbd 100644
--- a/.github/ISSUE_TEMPLATE/step_request.md
+++ b/.github/ISSUE_TEMPLATE/step_request.md
@@ -2,7 +2,8 @@
 name: New step request
 about: Suggest a new step/package manager to update
 title: ''
-labels: C-feature request, request step
+type: Feature
+labels: request step
 assignees: ''
 
 ---