diff --git a/.github/issue-template.md b/.github/ISSUE_TEMPLATE/bug-report.md
similarity index 84%
rename from .github/issue-template.md
rename to .github/ISSUE_TEMPLATE/bug-report.md
index 038ceb3f8f7..488bde1fe27 100644
--- a/.github/issue-template.md
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -1,6 +1,7 @@
 ---
-name: Issue Template
-about: Template for both bug reports and feature requests
+name: Bug Report
+about: Template for bug reports
+labels: kind/bug
 ---
 
 # Expected Behavior
diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
new file mode 100644
index 00000000000..876fe90587d
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-request.md
@@ -0,0 +1,13 @@
+---
+name: Feature Request
+about: Template for feature requests
+labels: kind/feature
+---
+
+### Feature request
+
+<!-- Please describe the feature request and why you would like to have it -->
+
+### Use case
+
+<!-- Please add a concrete use case to demonstrate how such a feature would add value for the user. If you don't have a use case for your feature, please remove this section (however providing a good use case increases the likelihood to be picked up) -->
diff --git a/.github/ISSUE_TEMPLATE/free-form.md b/.github/ISSUE_TEMPLATE/free-form.md
new file mode 100644
index 00000000000..4b924b562a1
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/free-form.md
@@ -0,0 +1,4 @@
+---
+name: Free Form
+about: Create an unstructured issue
+---