diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index 080dfe4b..00000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,14 +0,0 @@
-<b>System Information:</b>
-  <!-- Go to "Help → View Debug Log" and copy all lines above the separation here! -->
-
-  <!-- If you can't install Cockatrice to access that information, make
-       sure to include your OS and the app version from the setup file here -->
-_______________________________________________________________________________________
-
-  <!-- Explain your issue/request/suggestion in detail here! -->
-
-  <!-- This repository is ONLY about development of the Cockatrice app.
-       If you have any problems with a server (e.g. registering, connecting, ban...)
-       you have to contact that server's owner/admin. 
-       Check this list of public servers with webpage links and contact details:
-       https://github.com/Cockatrice/Cockatrice/wiki/Public-Servers -->
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 00000000..178716a0
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,17 @@
+---
+name: "🐛 Bug Report"
+about: Report an issue encountered while using Cockatrice
+title: ''
+labels: 'Bug'
+assignees: ''
+
+---
+
+<b>System Information:</b>
+  <!-- Go to "Help → View Debug Log" and copy all lines above the separation here! -->
+
+  <!-- If you can't install Cockatrice to access that information, make
+       sure to include your OS and the app version from the setup file here -->
+_______________________________________________________________________________________
+
+  <!-- Explain your issue in detail here! -->
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 00000000..62c77f6e
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: 💬 Discord Community (Get help with server issues, e.g. Login)
+    url: https://discord.gg/3Z9yzmA
+    about: Need help with using the client? Want to find some games? Try the Discord server!
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 00000000..91f2edea
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,23 @@
+---
+name: "💡 Feature Request"
+about: Request a new feature
+title: ''
+labels: 'Feature Request'
+assignees: ''
+
+---
+
+<!--
+Please search the issue tracker for similar issues before posting!
+If your request is related to another request (but not the same!) list it here
+-->
+**Similar Requests**
+
+
+<!-- Describe your feature idea here in detail -->
+**Description of New Feature**
+
+
+<!-- If your feature requires some context, provide it here -->
+**Additional Context**
+