diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 000000000..c84f522ae
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: ❓ Question
+    url: https://github.com/CommunitySolidServer/CommunitySolidServer/discussions/new/choose
+    about: A question about the server
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
deleted file mode 100644
index 642c2b892..000000000
--- a/.github/ISSUE_TEMPLATE/question.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-name: "❓ Question"
-about: A general question
-title: ''
-labels: ''
-assignees: ''
-
----
-
-#### Question
-
-<!-- Questions are usually better suited for discussions, which can be found at https://github.com/CommunitySolidServer/CommunitySolidServer/discussions -->
-<!-- In case you think this would better as an issue, please provide a clear and concisely formulated question.-->