diff --git a/.github/ISSUE_TEMPLATE/01_question.md b/.github/ISSUE_TEMPLATE/01_question.md
index afbcdd213d..b8292d02e2 100644
--- a/.github/ISSUE_TEMPLATE/01_question.md
+++ b/.github/ISSUE_TEMPLATE/01_question.md
@@ -2,11 +2,14 @@ name: ❓ Ask a question
 blank_issues_enabled: false
 contact_links:
 
-- name: Klaw Community Support
+- name: Ask question in Community Forum
+  url: https://aiven.io/community/forum/new-topic?category=open-source&tags=klaw
+  about: Ask questions in Aiven's Community Forum. The prefilled category and tag will help us see your questions fast.
+- name: Read in Community Forum
   url: https://aiven.io/community/forum/c/open-source/12
-  about: Please ask and answer questions here.
-- name: Klaw Github discussions
+  about: You can check for previous questions and also answer questions in our Open Source category in Aiven's Community Forum. Tip: You can filter by tag `klaw` if you want to check Klaw-only topics.
+- name: Klaw GitHub discussions
   url: https://github.com/aiven/klaw/discussions
-  about: Please ask and answer questions here.
+  about: You can ask and answer questions here, too!
 
 The Klaw team will cross post questions and answers across both forums. The Klaw Community Support forum, which is hosted and supported by Aiven directly, has more visibility for other interested parties, so we would encourage questions to be asked there. We will respond and answer questions in both GitHub discussions and the Community Forum.
diff --git a/README.md b/README.md
index 1ade2f2d2a..689a4215c2 100644
--- a/README.md
+++ b/README.md
@@ -151,8 +151,9 @@ For the versions available, see the [tags on this repository](https://github.com
 
 We encourage everyone to ask question, if you have a question someone else definitely does too.
 
-- [Klaw Community Support](https://aiven.io/community/forum/c/open-source/12)
-- [Klaw GitHub discussions](https://github.com/aiven/klaw/discussions)
+- [Ask in Klaw Community forum](https://aiven.io/community/forum/new-topic?category=open-source&tags=klaw)
+- [Read in Klaw Community forum](https://aiven.io/community/forum/c/open-source/12?tags=klaw)
+- [Ask and read in Klaw GitHub discussions](https://github.com/aiven/klaw/discussions)
 
 The Klaw team will cross post questions and answers across both forums. The Klaw Community Support forum, which is hosted and supported by Aiven directly, has more visibility for other interested parties, so we would encourage questions to be asked there. We will respond and answer questions in both GitHub discussions and the Community Forum.