diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 44ea490aaa..6adf0bfd7a 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -2,6 +2,7 @@
 name: Bug report
 about: Create a report to help us improve
 ---
+/kind bug
 
 **1. What `kops` version are you running? The command `kops version`, will display
  this information.**
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 50a181f963..2a18fb6f19 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -2,6 +2,7 @@
 name: Feature Request
 about: Help us identify features you need
 ---
+/kind feature
 
 **1. Describe IN DETAIL the feature/behavior/change you would like to see.**