diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index 4b9fff1c..f015250e 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -1,7 +1,15 @@
 <!--
 
-Thank you for opening an issue with Mailu. Please understand that issues are meant for bugs and enhancement-requests.
-For **user-support questions**, reach out to us  on [matrix](https://matrix.to/#/#mailu:tedomum.net).
+Thank you for opening an issue with Mailu. Please understand that issues are meant for bugs only. The bug report should follow the issue template and provide clear replication steps and logs.
+For **user-support questions**, reach out to us  on [matrix](https://matrix.to/#/#mailu:tedomum.net) or [disussions](https://github.com/Mailu/Mailu/discussions/categories/user-support).
+
+For anything but bug reports use the [matrix channel](https://matrix.to/#/#mailu:tedomum.net) or [disussions](https://github.com/Mailu/Mailu/discussions).
+So use discussions for topics such as
+
+* Checking announcements.
+* General discussion about Mailu usage or using Mail software in general.
+* Feature requests
+* User support.
 
 To be able to help you best, we need some more information.
 
@@ -10,6 +18,7 @@ Before you open your issue
 - Check [documentation](https://mailu.io/master/) and [FAQ](https://mailu.io/master/faq.html). (Tip, use the search function on the documentation page)
 - You understand `Mailu` is made by volunteers in their **free time** — be concise, civil and accept that delays can occur.
 - The title of the issue should be short and simple. It should contain specific terms related to the actual issue. Be specific while writing the title.
+- You understand issues are only meant for bug reports that follow the issue template. Non bug reports or bug reports that do not follow the template will be moved to [disussions](https://github.com/Mailu/Mailu/discussions)
 
 Please put your text outside of the comment blocks to be visible. You can use the button "Preview" above to check.
 
@@ -32,6 +41,8 @@ $> grep MAILU_VERSION docker-compose.yml mailu.env
 
 If you are not using docker compose do not file any new issue here.
 Kubernetes related issues belong to https://github.com/Mailu/helm-charts/issues
+If you are not using docker compose or kubernetes, create a new thread on user support in [disussions](https://github.com/Mailu/Mailu/discussions/categories/user-support).
+Non-bug reports (or bug reports that do not follow the template) are moved to [disussions](https://github.com/Mailu/Mailu/discussions).
 
 ## Description
 <!--
@@ -61,9 +72,10 @@ You can get the logs via `docker logs <container name> --tail 1000`.
 For example for the admin container: `docker logs mailu_admin_1 --tail 1000`
 or using docker compose `docker compose -f /mailu/docker-compose.yml logs --tail 1000 admin`
 
-If you can find the relevant section, please share only the parts that seem relevant. If you have any logs, please enclose them in code tags, like so:
+If you can find the relevant section, please share only the parts that seem relevant. If you have any logs, please enclose them in code tags and in a section, like so:
 
 ```
 Your logs here!
 ```
+
 -->