diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE/Bug_Report.md
similarity index 52%
rename from .github/ISSUE_TEMPLATE.md
rename to .github/ISSUE_TEMPLATE/Bug_Report.md
index b1c69ef2f..91c7d5a57 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE/Bug_Report.md
@@ -1,8 +1,16 @@
+---
+name: 'Bug Report'
+about: 'Report a reproducible bug in the framework.'
+title: ''
+labels: ''
+assignees: ''
+---
+
 # Impacted versions
 
 * OS Type: Debian/Ubuntu, Centos/Redhat, Arch, Gentoo, Slack, ...
 * OS Version: Number or Name
-* Database Type: PostgreSQL/MySQL
+* Database Type: PostgreSQL / MySQL
 * Database version: X.y
 * Modoboa: X.X.x
 * installer used: Yes/No ?
@@ -12,6 +20,13 @@
 
 # Current behavior
 
+<!--
+
+  Explain the behavior you're seeing that you think is a bug, and explain how you
+  think things should behave instead.
+
+-->
+
 # Expected behavior
 
 # Video/Screenshot link (optional)
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 000000000..5db193d51
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Modoboa Support
+    url: https://github.com/modoboa/modoboa/discussions
+    about: Please ask and answer questions here.
+  - name: Sponsoring
+    ur: https://modoboa.org/en/sponsoring/
+    about: You love Modoboa and want to sponsor it