diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index fa17734022..8893cd6fa3 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +1,5 @@
 blank_issues_enabled: true
 contact_links:
-  - name: Confidential Computing Discord
-    url: https://discord.com/invite/rH8QTH56JN
-    about: Join the Confidential Computing community!
+  - name: Having trouble or questions?
+    url: https://github.com/edgelesssys/constellation/discussions/new?category=q-a
+    about: Open a discussion instead! We will be happy to help you.
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
deleted file mode 100644
index abae67f75f..0000000000
--- a/.github/ISSUE_TEMPLATE/question.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-name: Question
-about: Get help or more information on a topic
-title: ''
-labels: question
-assignees: ''
-
----
-
-<!--
-Ask your question here.
-Make sure you've checked the docs at https://docs.edgeless.systems/constellation
-You can also search within the existing issues at https://github.com/edgelesssys/constellation/issues
--->