diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 70af366c4b..dd8f0557a3 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +1,8 @@
 blank_issues_enabled: false
 contact_links:
+  - name: OpenZFS Questions
+    url: https://github.com/openzfs/zfs/discussions/new
+    about: Ask the community for help
   - name: OpenZFS Community Support Mailing list (Linux)
     url: https://zfsonlinux.topicbox.com/groups/zfs-discuss
     about: Get community support for OpenZFS on Linux
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
deleted file mode 100644
index 0aee9f7c3d..0000000000
--- a/.github/ISSUE_TEMPLATE/question.md
+++ /dev/null
@@ -1,37 +0,0 @@
----
-name: Code Question
-about: Ask a question about the code
-title: ''
-labels: 'Type: Question'
-assignees: ''
-
----
-
-<!--
-Thank you for taking an interest in the OpenZFS codebase.
-
-Please be aware that most questions are preferably asked in the mailing list first.
-This form is primarily meant for asking questions about the code itself.
-
-Please also check our issue tracker before opening a new question.
-Filling out the following template will help other contributors better understand your question.
--->
-
-### Ask your question!
-
-<!--
-Please provide a clear and concise question.
--->
-
-### Which portion of the codebase does your question involve?
-
-<!--
-Optional: Please describe what portion of the codebase your issue involved.
-Example: "Testsuite", "Buildbots", "CLI", a code snippet etc.
--->
-
-### Additional context
-
-<!--
-Any additional information you want to add?
--->