diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 000000000..9dc409dd7
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Question
+    url: https://github.com/cdr/code-server/discussions/new?category_id=22503114
+    about: Ask the community for help
diff --git a/.github/issue_template.md b/.github/issue_template.md
deleted file mode 100644
index 7ec9929e2..000000000
--- a/.github/issue_template.md
+++ /dev/null
@@ -1,4 +0,0 @@
-<!--
-Please file all questions and support requests at https://www.reddit.com/r/codeserver/
-The issue tracker is only for bugs and features.
--->
diff --git a/doc/FAQ.md b/doc/FAQ.md
index bbc2ad6a8..129498e4f 100644
--- a/doc/FAQ.md
+++ b/doc/FAQ.md
@@ -30,9 +30,7 @@
 
 ## Questions?
 
-Please file all questions and support requests at https://www.reddit.com/r/codeserver/.
-
-The issue tracker is **only** for bugs and features.
+Please file all questions and support requests at https://github.com/cdr/code-server/discussions.
 
 ## How can I reuse my VS Code configuration?