diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000000..4aeb06d6d5
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,83 @@
+---
+name: Bug report
+about: Found a problem? Help us improve.
+title: "[BUG] Title"
+labels: ''
+assignees: ''
+
+---
+
+<!-- Important: Read First -->
+
+<!-- Please do not make support requests on Github. -->
+<!-- Our issue tracker is for tracking bugs and feature requests only. -->
+<!-- If you need help configuring the emulator please make a request on our forums or contact us on discord. -->
+<!-- If you are unsure, start with discord or the forums. -->
+
+<!-- We only accept bug reports for the latest dev version. -->
+<!-- Please try upgrading before making an issue. -->
+
+<!-- Please make an effort to make sure your issue isn't already reported. -->
+
+<!-- We are not accepting bug reports for PSX mode at this time. -->
+<!-- If you are interested in helping contribute to PSX mode please do so on the forums. -->
+<!-- Otherwise our recommendation is that you use a proper PSX emulator. -->
+
+<!-- We do not accept issues relating to upscaling at this time. -->
+<!-- We are aware of the various problems with upscaling. -->
+<!-- The issue spans many games and having hundreds of issues for the same fundamental issues isn't particularly helpful. -->
+<!-- There are several workarounds for graphical problems that come as a result of upscaling. -->
+<!-- Please try your game at native resolution before creating an issue. -->
+<!-- If your bug is the result of upscaling please use the forums or discord for assistance with various upscaling workarounds. -->
+<!-- Additionally, the unofficial PCSX2 Wiki often lists various fixes for upscaling issues. -->
+
+<!-- We are not accepting issues related to the libretro core. -->
+<!-- The libretro core is being maintained separately at this time. -->
+
+<!-- Please make sure your system meets our requirements for OS version, CPU and GPU. -->
+<!-- We do not accept bug reports for unsupported operating systems. -->
+<!-- Performance issues as a result of not meeting our hardware requirements are not valid. -->
+<!-- Please read our known issues pages for AMD and Intel drivers. -->
+
+<!-- Discord: https://discord.com/invite/TCz3t9k -->
+<!-- Forums: https://forums.pcsx2.net/index.php -->
+<!-- Wiki: https://wiki.pcsx2.net/Main_Page -->
+<!-- System Requirements: https://github.com/PCSX2/pcsx2#system-requirements -->
+<!-- Intel Drivers: https://github.com/PCSX2/pcsx2/wiki/OpenGL-and-Intel-GPUs-All-you-need-to-know -->
+<!-- AMD Drivers: https://github.com/PCSX2/pcsx2/wiki/OpenGL-and-AMD-GPUs---All-you-need-to-know -->
+<!-- PSX Emulators: https://emulation.gametechwiki.com/index.php/PlayStation_emulators -->
+<!-- macOS Support: https://forums.pcsx2.net/Thread-Native-Mac-Testing-Build -->
+
+**Describe the bug**
+<!-- A clear and concise description of what the bug is. -->
+
+**To Reproduce**
+<!-- Steps to reproduce the behavior. -->
+
+**Expected behavior**
+<!-- A clear and concise description of what you expected to happen. -->
+
+**GS Settings**
+<!-- Any non-default settings for GS. -->
+<!-- If you don't want to list them out, please provide screenshots of your configuration window (including hw hacks if enabled). -->
+
+**Emulation Settings**
+<!-- Any non-default core settings. -->
+<!-- If you don't want to list them out, please provide screenshots of your configuration window. -->
+<!-- Please note that the safe preset works for most games. -->
+<!-- MTVU can have some compatibility issues so please disable it before making a report. -->
+<!-- If you need to modify the settings manually because a game requires you to do so to work, please state that explicitly. -->
+
+**GS Window Screenshots**
+<!-- If your issue is graphical in nature and you think screenshots will help illustrate your issue, you may do that here. -->
+
+**System Info (please complete the following information):**
+ - PCSX2 Revision: <!-- e.g. dev-525 -->
+ - OS: <!-- e.g. Windows 10 -->
+ - CPU: <!-- e.g. i5-7600 -->
+ - GPU: <!-- e.g. GTX 1070 -->
+
+**Logs and Dumps**
+<!-- Please feel free to attach any logs, block dumps, GSdump, etc here. -->
+<!-- If your problem is graphical in nature it is highly recommended that you provide a GSdump. -->
+<!-- GSdump Guide: https://forums.pcsx2.net/Thread-How-to-create-a-proper-GS-dump -->
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000000..f4fc941c93
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,11 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Support Forums
+    url: https://forums.pcsx2.net/index.php
+    about: For community support and answers
+  - name: Discord
+    url: https://discord.com/invite/TCz3t9k
+    about: Get direct support and hang out with us
+  - name: Wiki
+    url: https://wiki.pcsx2.net/Main_Page
+    about: For user provided information and reports
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000000..ad985aad87
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,22 @@
+---
+name: Feature request
+about: Suggest a feature
+title: "[Feature Request] Title"
+labels: ''
+assignees: ''
+
+---
+
+**Description**
+<!-- A concise description of the feature you want. -->
+<!-- Include step by step examples of how the feature should work under various circumstances. -->
+
+**Reason**
+<!-- Give a reason why you want this feature. -->
+<!-- How does this feature help your enjoyment of the emulator? -->
+<!-- What does it provide that isn't being provided currently? -->
+<!-- How will it make things easier for you? -->
+
+**Examples**
+<!-- Provide examples of the feature as implemented by other software. -->
+<!-- Include screenshots or video if you like to help demonstrate how you'd like this feature to work. -->
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
deleted file mode 100644
index 4e8829bbee..0000000000
--- a/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,32 +0,0 @@
-***PCSX2 version:***
-``(For example, stable build v1.6.0 (or) development builds v1.7.0-dev-xxx)``
-
-- **Notes**:
-  - It's preferred to only report bugs which are present on the [latest development builds](https://pcsx2.net/download/development.html).
-  - The PSX backward compatibility mode is still in its early stage of development. Issue reports are too early at this point.
-
-***PCSX2 options:***
-``(For example, Clamping/Rounding, Speedhacks, GameFixes)``
-
-- **Note**: Generally it's recommended to have settings as default as possible and use the ``Safest`` preset. If there's no issue with these settings but there is an issue with some other non-default option, then please state it explicitly.
-
-
-***Plugins used:***
-``(Relevant/Non-default settings of GS/PAD/SPU2/CDVD/USB plugins)``
-
-- **Note**: In case the issue is a graphical problem with the GSdx plugin, please provide basic information like ``Renderer/Internal resolution/CRC Hack level/Other relevant options`` which were used to reproduce the issue. Additionally, providing a [GS dump](https://forums.pcsx2.net/Thread-How-to-create-a-proper-GS-dump) of the issue would also be helpful.
-
-***Description of the issue:***
-``(What's the problem? - Screenshots showing the issue if applicable)``
-
-
-***How to reproduce the issue:***
-``(Detailed step by step guide on how to replicate the issue)``
-
-
-***Last known version to work:***
-``(If the issue isn't present in an older PCSX2 version, it would be helpful to mention the full title of that version. Narrowing it down to the build/commit that first introduced the issue is even better!)``
-
-
-***PC specifications:***
-``(For example: CPU: Intel Core 2 Duo E4600 GPU: Gigabyte GTX 750Ti OS: Windows 10 64 Bit)``