diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE/bug_report.md
similarity index 89%
rename from .github/ISSUE_TEMPLATE.md
rename to .github/ISSUE_TEMPLATE/bug_report.md
index 56c19b47a..834fb3a43 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,3 +1,12 @@
+---
+name: Bug report
+about: Create a report to help us improve.
+title: ''
+labels: kind/bug
+assignees: ''
+
+---
+
 <!--
 
     Please do *NOT* ask usage questions in Github issues.
@@ -10,12 +19,7 @@
     You can find more information at: https://prometheus.io/community/
 
 -->
-## Proposal
-**Use case. Why is this important?**
 
-*“Nice to have” is not a good use case. :)*
-
-## Bug Report
 **What did you do?**
 
 **What did you expect to see?**
@@ -47,8 +51,6 @@ insert configuration here (if relevant to the issue)
 ```
 
 
-
-
 * Logs:
 ```
 insert Prometheus and Alertmanager logs relevant to the issue here
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 000000000..ecd303004
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Users Mailing List
+    url: https://groups.google.com/forum/#!forum/prometheus-users
+    about: Please ask and answer usage questions here.
+  - name: Prometheus Community
+    url: https://prometheus.io/community/
+    about: List of communication channels for the Prometheus community.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 000000000..c1e61f5eb
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,25 @@
+---
+name: Feature request
+about: Suggest an idea for this project.
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+<!--
+
+    Please do *NOT* ask usage questions in Github issues.
+
+    If your issue is not a feature request or bug report use:
+    https://groups.google.com/forum/#!forum/prometheus-users. If
+    you are unsure whether you hit a bug, search and ask in the
+    mailing list first.
+
+    You can find more information at: https://prometheus.io/community/
+
+-->
+## Proposal
+**Use case. Why is this important?**
+
+*“Nice to have” is not a good use case. :)*