2 files changed, 3 insertions, 18 deletions

diff --git a/.github/ISSUE_TEMPLATE/40-question.md b/.github/ISSUE_TEMPLATE/40-question.md
deleted file mode 100644
index 42355e574..000000000
--- a/.github/ISSUE_TEMPLATE/40-question.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-name: 🙋 Question
-about: Use this template to ask questions that could not get solved over chat
-labels: 'Type: Question'
----
-
-<!--
-Please read FAQ.md and docs.joinpeertube.org first.
-Please search among past open/closed issues for a similar one beforehand:
-- https://github.com/Chocobozzz/PeerTube/issues?q=
-- https://framacolibri.org/c/peertube
-Please ask first on the IRC/Matrix chat room. If nobody answers after 24h (except weekends), please fill an issue here.
-
-All done? Then ask your question below:
--->
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 2911f6202..3e041d555 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,11 +1,11 @@
 blank_issues_enabled: false
 contact_links:
+  - name: 🤷💻🤦 Question/Forum
+    url: https://framacolibri.org/c/peertube
+    about: You can ask and answer other questions here
   - name: 💬 Matrix
     url: https://matrix.to/#/#peertube:matrix.org
     about: Chat with us via Matrix for quick Q/A here
   - name: 💬 IRC
     url: https://web.libera.chat/#peertube
     about: Chat with us via IRC for quick Q/A here
-  - name: 🤷💻🤦 Forum
-    url: https://framacolibri.org/c/peertube
-    about: You can ask and answer other questions here