diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE/bug-report.md
similarity index 84%
rename from .github/ISSUE_TEMPLATE.md
rename to .github/ISSUE_TEMPLATE/bug-report.md
index 4c62c1e18e..ff49e05a1e 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -1,7 +1,13 @@
+---
+name: "\U0001F41B Bug report"
+about: Report a bug or a technical issue
+
+---
+
 <!--
    SUPPORT REQUESTS: This is for reporting bugs in the Bisq app.
    If you have a support request, please join #support on Bisq's
-   Keybase team at https://keybase.io/team/Bisq
+   Keybase team over at https://keybase.io/team/Bisq
 -->
 
 ### Description
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000000..43c42f28c0
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: 💡 Feature Request
+    url: https://github.com/bisq-network/bisq/discussions
+    about: Request new features or upgrades to existing tools
+  - name: 💬 Community Support Chat
+    url: https://keybase.io/team/bisq
+    about: Ask general questions and get community support