diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 6bd416a38..81d55846a 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,5 +1,40 @@
+<!--
+Before opening a new issue, please ensure:
+- You use the forums for support/questions
+- You search for existing bugs/feature requests
+- Remove extraneous template details
+-->
 
+## Support / Questions
 
+Please use https://forums.sonarr.tv/ for support. Support requests or questions will be redirected to the forums and the issue will be closed.
 
-Provide a description of the feature request or bug, the more details the better.
-Please use https://forums.sonarr.tv/ for support or other questions. (When in doubt, use the forums)
+<!--
+Remove if not opening a bug report
+-->
+
+## Bug Report
+
+### System Information/Logs
+
+**Sonarr Version:**
+
+**Operating System:**
+
+**.net Framework (Windows) or mono (macOS/Linux) Version:**
+
+**Link to Log Files (debug or trace):**
+
+**Browser (for UI bugs):**
+
+### Additional Information
+
+<!--
+Remove if not opening a feature request
+-->
+
+## Feature Request
+
+### What problem are you looking to solve?
+
+### Other Information
diff --git a/.github/SUPPORT.md b/.github/SUPPORT.md
new file mode 100644
index 000000000..c6cf56c79
--- /dev/null
+++ b/.github/SUPPORT.md
@@ -0,0 +1,7 @@
+## Support
+
+There are a number of frequently asked questions that have been answered in our [FAQ](https://github.com/Sonarr/Sonarr/wiki/FAQ)
+
+The [wiki](https://github.com/Sonarr/Sonarr/wiki) contains other information and guides
+
+If you have a support question, please use the [support forums](https://forums.sonarr.tv/).