diff --git a/.github/ISSUE_TEMPLATE/Bug_report.md b/.github/ISSUE_TEMPLATE/Bug_report.md
index 619f6499f..05b22c8bc 100644
--- a/.github/ISSUE_TEMPLATE/Bug_report.md
+++ b/.github/ISSUE_TEMPLATE/Bug_report.md
@@ -1,11 +1,11 @@
 ---
 name: Bug report
-about: This template is only for bug reports
+about: This template is only for bug reports, use the forum for questions and feature requests.
 
 ---
 
 <!-- Please, read the documentation: https://docs.kanboard.org/ -->
-<!-- Ask questions on the Forum: https://github.com/kanboard/forum/issues -->
+<!-- Ask questions on the Forum: https://kanboard.discourse.group/ -->
 
 ### Actual behaviour
 
diff --git a/.github/ISSUE_TEMPLATE/Feature_request.md b/.github/ISSUE_TEMPLATE/Feature_request.md
deleted file mode 100644
index ee86dcc9c..000000000
--- a/.github/ISSUE_TEMPLATE/Feature_request.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-
----
-
-<!-- Write a clear and concise description of your idea -->
-<!-- Do not forget that this project has very limited resources. Please, read https://docs.kanboard.org/en/latest/developer_guide/faq.html#why-are-you-not-developing-my-feature-request -->
diff --git a/.github/issue_template.md b/.github/issue_template.md
index dc1f94622..820fed23c 100644
--- a/.github/issue_template.md
+++ b/.github/issue_template.md
@@ -5,7 +5,7 @@ This issue is:
 - [ ] Improvement
 
 - Please, read the [Frequently Asked Questions](https://docs.kanboard.org/en/latest/developer_guide/faq.html).
-- Ask questions on the [Forum](https://github.com/kanboard/forum/issues).
+- Ask questions on the [Forum](https://kanboard.discourse.group/).
 
 ### Actual behaviour
 
diff --git a/README.md b/README.md
index 0a6087fd4..3754bccbb 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,7 @@ Kanboard is project management software that focuses on the Kanban methodology.
 - Official website: <https://kanboard.org/>
 - [List of features](https://kanboard.org/#features)
 - [Change Log](https://github.com/kanboard/kanboard/blob/master/ChangeLog)
+- [Forum](https://kanboard.discourse.group/)
 - Official documentation: <https://docs.kanboard.org/>
     - [Requirements](https://docs.kanboard.org/en/latest/admin_guide/requirements.html)
     - [Installation instructions](https://docs.kanboard.org/en/latest/admin_guide/installation.html)