diff --git a/.github/ISSUE_TEMPLATE/bug_report_template.md b/.github/ISSUE_TEMPLATE/bug_report.md
similarity index 93%
rename from .github/ISSUE_TEMPLATE/bug_report_template.md
rename to .github/ISSUE_TEMPLATE/bug_report.md
index c381f3e2dc5..73b6880b367 100644
--- a/.github/ISSUE_TEMPLATE/bug_report_template.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,9 +1,11 @@
 ---
-title: 'Bug report'
-labels: bug
+name: 'Bug report'
 about: Tell us about a problem you are experiencing.
+
 ---
 
+/kind bug
+
 **What steps did you take and what happened:**
 [A clear and concise description of what the bug is.]
 
diff --git a/.github/ISSUE_TEMPLATE/feature_request_template.md b/.github/ISSUE_TEMPLATE/feature_request.md
similarity index 90%
rename from .github/ISSUE_TEMPLATE/feature_request_template.md
rename to .github/ISSUE_TEMPLATE/feature_request.md
index 74599ad1c7e..90f1a38ec2d 100644
--- a/.github/ISSUE_TEMPLATE/feature_request_template.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,9 +1,11 @@
 ---
-title: 'Feature request'
-labels: feature
+name: 'Feature request'
 about: Suggest an idea for this project.
+
 ---
 
+/kind feature
+
 **Describe the solution you'd like**
 [A clear and concise description of what you want to happen.]