diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE/bug_report.md
similarity index 63%
rename from .github/ISSUE_TEMPLATE.md
rename to .github/ISSUE_TEMPLATE/bug_report.md
index 2633c3360..f00f910e2 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,12 +1,24 @@
+---
+name: Bug report
+about: Template for bug reports.
+title: ''
+labels: ''
+assignees: ''
+
+---
+
 <!--
-# THIS IS NOT A SUPPORT FORUM! For support go here:
-# Xenia Discord (#help) - https://discord.me/xenia-emulator
+# THIS IS NOT A SUPPORT FORUM! For support, first read the wiki:
+# https://github.com/xenia-project/xenia/wiki
+#
+# If your question wasn't answered there or you need help, proceed here:
+# Xenia Discord (#help) - https://discord.gg/5g93S8H
 # /r/xenia (questions thread) - https://www.reddit.com/r/xenia/
 #
 # DO NOT CREATE ISSUES ABOUT SPECIFIC GAMES IN THIS REPOSITORY!
 # a game specific issue would be e.g. "Game X crashes after you hit a character a certain way"
 # A Xenia issue would be e.g. "Kernel export NtDoSomething does nothing"
-# For specific games, visit https://github.com/xenia-project/game-compatibility/issues
+# For specific games, visit https://github.com/xenia-project/game-compatibility#game-compatibility
 #
 # Try to create a very concise title that's straight to the point
 -->
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 000000000..3c70c7caa
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Xenia Discord server
+    url: https://discord.gg/5g93S8H
+    about: Tech support for Xenia belongs here.