diff --git a/CONTRIBUTING.md b/.github/CONTRRIBUTING.md
similarity index 100%
rename from CONTRIBUTING.md
rename to .github/CONTRRIBUTING.md
diff --git a/.github/ISSUE_TEMPLATE/Bug_report.md b/.github/ISSUE_TEMPLATE/Bug_report.md
new file mode 100644
index 0000000000..b769863b7c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Bug_report.md
@@ -0,0 +1,37 @@
+---
+name: "\U0001F41BBug report"
+about: "If something isn't working as expected \U0001F914."
+
+---
+Please check if your issue is not a duplicate by [searching existing issues](https://github.com/runelite/runelite/issues)
+
+| Question    | Answer
+| ------------| ---------------
+| Java Version | x.y.z
+| Operating System | e.g. Ubuntu/Windows/MacOS
+
+
+<!--
+- Replace this comment with your issue description.
+
+- Please complete the above table with a correct information.
+
+- Please include steps to reproduce your issue.
+
+- For general support, please use our Discord server: https://discord.gg/mePCs8U
+-->
+
+<!--
+- Please past your full stack trace below, if applicable 
+
+- Your client logs can usually be found in:
+- Windows: C:\Users\<your_user_name>\.runelite\logs
+- Osx/Linux: ~/.runelite/logs
+-->
+<details>
+ <summary>stack trace</summary>
+ 
+ ```
+  %paste your stack trace here%
+ ```
+</details>
diff --git a/.github/ISSUE_TEMPLATE/Custom.md b/.github/ISSUE_TEMPLATE/Custom.md
new file mode 100644
index 0000000000..d6dab2b143
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Custom.md
@@ -0,0 +1,10 @@
+---
+name: "\U0001F917 Support Question"
+about: "If you have a question \U0001F4AC, please check out our Discord"
+
+---
+
+--------------^ Click "Preview" for a nicer view!
+We primarily use GitHub as an issue & suggestion tracker; for usage and support questions, please check join our Discord: https://discord.gg/mePCs8U
+
+---
diff --git a/.github/ISSUE_TEMPLATE/Feature_request.md b/.github/ISSUE_TEMPLATE/Feature_request.md
new file mode 100644
index 0000000000..8c72f90386
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Feature_request.md
@@ -0,0 +1,17 @@
+---
+name: "\U0001F680 Feature Request or RFC"
+about: "I have a suggestion (and may want to implement it \U0001F642)!"
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/README.md b/README.md
index 1e6ab097f2..a21c9d8aa4 100644
--- a/README.md
+++ b/README.md
@@ -27,4 +27,4 @@ RuneLite is licensed under the BSD 2-clause license. See the license header in t
 
 ## Contribute and Develop
 
-We've set up a separate document for our [contribution guidelines](https://github.com/runelite/runelite/blob/master/CONTRIBUTING.md).
+We've set up a separate document for our [contribution guidelines](https://github.com/runelite/runelite/blob/master/.github/CONTRIBUTING.md).