diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index 8086a6b86e5..00000000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,16 +0,0 @@
-Read before posting: 
-
-- Questions should be posted to https://community.grafana.com. Please search there and here on GitHub for similar issues before creating a new issue. 
-- Checkout FAQ: https://community.grafana.com/c/howto/faq
-- Checkout How to troubleshoot metric query issues: https://community.grafana.com/t/how-to-troubleshoot-metric-query-issues/50
-
-Please include this information:
-### What Grafana version are you using?
-### What datasource are you using?
-### What OS are you running grafana on?
-### What did you do?
-### What was the expected result?
-### What happened instead?
-### If related to metric query / data viz:
-### Include raw network request & response: get by opening Chrome Dev Tools (F12, Ctrl+Shift+I on windows, Cmd+Opt+I on Mac), go the network tab.
- 
diff --git a/.github/ISSUE_TEMPLATE/1-bug_report.md b/.github/ISSUE_TEMPLATE/1-bug_report.md
new file mode 100644
index 00000000000..eb87a7fc1c9
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/1-bug_report.md
@@ -0,0 +1,27 @@
+---
+name: Bug report
+about: Report a bug you found when using Grafana
+labels: 'type: bug'
+---
+
+<!--
+Please use this template while reporting a bug and provide as much info as possible.
+Questions should be posted to https://community.grafana.com
+Use query inspector to troubleshoot issues: https://community.grafana.com/t/using-grafanas-query-inspector-to-troubleshoot-issues/2630
+-->
+
+**What happened**:
+
+**What you expected to happen**:
+
+**How to reproduce it (as minimally and precisely as possible)**:
+
+**Anything else we need to know?**:
+
+**Environment**:
+- Grafana version:
+- Data source type & version:
+- OS Grafana is installed on:
+- User OS & Browser:
+- Grafana plugins:
+- Others:
diff --git a/.github/ISSUE_TEMPLATE/2-feature_request.md b/.github/ISSUE_TEMPLATE/2-feature_request.md
new file mode 100644
index 00000000000..0a8b2a63a72
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/2-feature_request.md
@@ -0,0 +1,11 @@
+---
+name: Enhancement Request
+about: Suggest an enhancement or new feature for the Grafana project
+labels: 'type: feature request'
+---
+
+<!-- Please only use this template for submitting feature requests -->
+
+**What would you like to be added**:
+
+**Why is this needed**:
diff --git a/.github/ISSUE_TEMPLATE/3-accessibility.md b/.github/ISSUE_TEMPLATE/3-accessibility.md
new file mode 100644
index 00000000000..c8a2d899ff6
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/3-accessibility.md
@@ -0,0 +1,26 @@
+---
+name: Accessibility problem or improvement request
+about: Help make Grafana be better at keyboard navigation, screen-readable and accessible to all.
+labels: 'type: accessibility'
+---
+
+<!--
+Please only use this template for submitting accessibility issues.
+
+This is a new feature area for Grafana that we want to improve. We have long way to go
+to really improve accessibility and would like your help to know where to start.
+-->
+
+**Steps to reproduce**:
+
+**Actual Result**:
+
+**Expected Result**
+
+**Relevant WCAG Criteria:** [#.#.# WCAG Criterion](link to https://www.w3.org/WAI/WCAG21/quickref/?versions=2.0)
+
+**Environment**:
+- Grafana version:
+- Data source type & version:
+- User OS & Browser:
+- Others:
diff --git a/.github/ISSUE_TEMPLATE/4-question.md b/.github/ISSUE_TEMPLATE/4-question.md
new file mode 100644
index 00000000000..7ee98327e4c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/4-question.md
@@ -0,0 +1,14 @@
+---
+name: Question / Support request
+about: 'Question or support request relating to using Grafana'
+title: ''
+labels: ''
+assignees: ''
+---
+
+STOP -- PLEASE READ!
+
+GitHub is not the right place for questions and support requests.
+
+Please ask questions on our community site: [https://community.grafana.com/](https://community.grafana.com/)
+