diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
index 1ebc2ecc4..5b2c07308 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -1,7 +1,7 @@
 name: "🐞 Bug report (encountered problems/errors)"
 description: Something is not working as it should
 title: "[Bug] "
-labels: [🐞 Bug report]
+labels: "🐛 Type: Bug"
 
 body:
   - type: markdown
diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml
index 71451d8ba..5996800eb 100644
--- a/.github/ISSUE_TEMPLATE/feature-request.yml
+++ b/.github/ISSUE_TEMPLATE/feature-request.yml
@@ -1,7 +1,7 @@
 name: "⭐ Feature request (request for new functionality)"
 description: Help make Cmder even better
 title: "[Feature request] "
-labels: [⭐ Feature request]
+labels: "🛠 Type: Feature Request"
 
 body:
   - type: markdown
diff --git a/.github/ISSUE_TEMPLATE/question.yml b/.github/ISSUE_TEMPLATE/question.yml
index 0285cf408..efe561362 100644
--- a/.github/ISSUE_TEMPLATE/question.yml
+++ b/.github/ISSUE_TEMPLATE/question.yml
@@ -1,6 +1,7 @@
 name: "❓ Question"
 description: Something is unclear or needs to be discussed
-labels: [❓ Question]
+title: "Question: "
+labels: "❔ Type: Question"
 
 body:
   - type: markdown