diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index f6cccad084a..a17f7d1811b 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,8 +1,8 @@
 ---
-name: ⚠️ Bug report
+name: "⚠️ Bug report"
 about: Create a report to help us improve
 title: ""
-labels: bug
+labels: "type: bug"
 assignees: ""
 ---
 
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 3b3f1dd9c1f..c58daaf219e 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,8 +1,8 @@
 ---
-name: 💡 Feature request
+name: "\U0001F4A1 Feature request"
 about: Suggest an idea for this project
 title: ""
-labels: feature request
+labels: "type: feature request"
 assignees: ""
 ---