diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE/BUG_REPORT.md
similarity index 87%
rename from .github/ISSUE_TEMPLATE.md
rename to .github/ISSUE_TEMPLATE/BUG_REPORT.md
index 3aad07999..fb0a0a639 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: 'type:Bug'
+assignees: ''
+
+---
+
 Found a bug? Please fill out the sections below. 👍
 
 ### Issue Summary
diff --git a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md
new file mode 100644
index 000000000..260f6a11d
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md
@@ -0,0 +1,42 @@
+---
+name: "🚀 Feature request"
+about: Suggest an idea for improving Wagtail
+title: ''
+labels: 'type:Enhancement'
+assignees: ''
+
+---
+
+### Is your proposal related to a problem?
+
+<!--
+  Provide a clear and concise description of what the problem is.
+  For example, "I'm always frustrated when..."
+-->
+
+(Write your answer here.)
+
+### Describe the solution you'd like
+
+<!--
+  Provide a clear and concise description of what you want to happen.
+-->
+
+(Describe your proposed solution here.)
+
+### Describe alternatives you've considered
+
+<!--
+  Let us know about other solutions you've tried or researched.
+-->
+
+(Write your answer here.)
+
+### Additional context
+
+<!--
+  Is there anything else you can add about the proposal?
+  You might want to link to related issues here, if you haven't already.
+-->
+
+(Write your answer here.)
diff --git a/.github/ISSUE_TEMPLATE/QUESTION.md b/.github/ISSUE_TEMPLATE/QUESTION.md
new file mode 100644
index 000000000..2a67eb3da
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/QUESTION.md
@@ -0,0 +1,16 @@
+---
+name: "⛔ Question"
+about: Please use StackOverflow or Slack for support
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+Please do not use GitHub for asking questions. Instead, if you have a general question about Wagtail or about building a site with Wagtail we encourage you to post on our Slack workspace instead of this issue tracker: https://github.com/wagtail/wagtail/wiki/Slack. The maintainers and other community members can provide help and answer your questions there.
+
+Please keep in mind that many of Wagtail's core and expert developers prefer to handle support queries through [Stack Overflow](https://stackoverflow.com/questions/tagged/wagtail), since the non-realtime format encourages more structured and fully-formed questions. Asking questions on Stack Overflow requires more up-front effort (see Stack Overflow's advice on how to ask a good question), but you may well find you get a better response as a result.
+
+If you've discovered a bug or would like to propose a change please use one of the other issue templates.
+
+Thanks!
diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 3e4268aa9..9825488d0 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -410,6 +410,7 @@ Contributors
 * Brian Whitton
 * Tim White
 * Mike Janger
+* Prithvi MK
 
 Translators
 ===========