diff --git a/framework/core/.github/ISSUE_TEMPLATE.md b/framework/core/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index e7a082240..000000000
--- a/framework/core/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,29 +0,0 @@
-> Issues on Github are meant for bug reporting. Please post feature requests on the [discussion forum](https://discuss.flarum.org/t/features).
----
-> Try to complete the below form as far as you are able and are willing to share. Add a screenshot of the issue if you can.
-
-## Explanation
-
-Explain, in simple terms, but with as much detail as possible, your issue.
-Be specific: What happened? What would you expect to happen? What have you tried so far?
-
-## Technical details
-
-- Version of Flarum: x.y.z
-- Website URL where the bug is visible: http://example.com
-- The webserver you are running: apache, nginx or something else
-- PHP version: x.y.z
-- Hosted environment: shared or vps
-- Hosting provider: http://some-amazing-provider.com
-
-## Flarum info
-
-```
-Output of "php flarum info", run this in terminal in your Flarum directory.
-```
-
-## Log files
-
-```
-Put any relevant logs here.
-```
diff --git a/framework/core/.github/ISSUE_TEMPLATE/bug-report.md b/framework/core/.github/ISSUE_TEMPLATE/bug-report.md
new file mode 100644
index 000000000..e96041d18
--- /dev/null
+++ b/framework/core/.github/ISSUE_TEMPLATE/bug-report.md
@@ -0,0 +1,40 @@
+---
+name: "🐛 Bug Report"
+about: "If something isn't working as expected"
+
+---
+
+## Bug Report
+
+**Current Behavior**
+A clear and concise description of the behavior.
+
+**Steps to Reproduce**
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected Behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Environment**
+- Flarum version: x.y.z
+- Website URL: http://example.com
+- Webserver: [e.g. apache, nginx]
+- Hosting environment: [e.g. shared, vps]
+- PHP version: x.y.z
+- Browser: [e.g. chrome 67, safari 11]
+
+```
+Output of "php flarum info", run this in terminal in your Flarum directory.
+```
+
+**Possible Solution**
+<!--- Only if you have suggestions or a fix for the bug -->
+
+**Additional Context**
+Add any other context about the problem here.
diff --git a/framework/core/.github/ISSUE_TEMPLATE/feature-request.md b/framework/core/.github/ISSUE_TEMPLATE/feature-request.md
new file mode 100644
index 000000000..a65b473e8
--- /dev/null
+++ b/framework/core/.github/ISSUE_TEMPLATE/feature-request.md
@@ -0,0 +1,26 @@
+---
+name: "🚀 Feature Request"
+about: "I have a suggestion (and may want to implement it!)"
+
+---
+
+<!--
+Note: The issue tracker is only for serious requests which have had some thought and planning put into them. If you just have an idea you would like to discuss, please post in the Flarum Community: https://discuss.flarum.org/t/feedback
+-->
+
+## Feature Request
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. eg. I have an issue when [...]
+
+**Describe the solution you'd like**
+A detailed description of your proposed solution. Include:
+- How the feature would work/behave
+- Any potential drawbacks
+- Maybe a screenshot, design, or example code
+
+**Justify why this feature belongs in Flarum's core, rather than in a third-party extension**
+Consider who this change will be useful to – most Flarum forums, or just a few?
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
diff --git a/framework/core/.github/ISSUE_TEMPLATE/support-question.md b/framework/core/.github/ISSUE_TEMPLATE/support-question.md
new file mode 100644
index 000000000..ba64057bd
--- /dev/null
+++ b/framework/core/.github/ISSUE_TEMPLATE/support-question.md
@@ -0,0 +1,11 @@
+---
+name: "🙋‍ Support Question"
+about: "If you have a question, please check out our forum or Discord!"
+
+---
+
+We primarily use GitHub as an issue tracker; for usage and support questions, please check out these resources below. Thanks!
+
+* Flarum Community: https://discuss.flarum.org
+* Discord Chat: https://flarum.org/discord
+* Twitter: https://twitter.com/flarum
diff --git a/framework/core/.github/PULL_REQUEST_TEMPLATE.md b/framework/core/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 000000000..a4cf8816e
--- /dev/null
+++ b/framework/core/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,10 @@
+**Fixes #0000**
+
+**Changes proposed in this pull request:**
+<!-- fill this out -->
+
+**Reviewers should focus on:**
+<!-- fill this out -->
+
+**Screenshot**
+<!-- include an image of the most relevant user-facing change, if any -->