diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index d44477c032..2807ece489 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -34,3 +34,5 @@ If applicable, add screenshots to help explain your problem.
 Add any other context about the problem here.
 e.g. code snippet to reproduce the issue.
 e.g. stack trace, memory dump, debugger log, and many etc.
+
+<!-- For general inquiries, please post in [FreeRTOS forum](https://forums.freertos.org) for community support. -->
diff --git a/.github/ISSUE_TEMPLATE/documentation-issue.md b/.github/ISSUE_TEMPLATE/documentation-issue.md
index 062a678b53..3f81276f93 100644
--- a/.github/ISSUE_TEMPLATE/documentation-issue.md
+++ b/.github/ISSUE_TEMPLATE/documentation-issue.md
@@ -19,3 +19,5 @@ If applicable, please attach screenshot.
 **Browser**
 - Browser: [e.g. Chrome]
 - Version: [e.g. 80.0.3987.132]
+
+<!-- For general inquiries, please post in [FreeRTOS forum](https://forums.freertos.org) for community support. -->
diff --git a/.github/ISSUE_TEMPLATE/general-inquiry.md b/.github/ISSUE_TEMPLATE/general-inquiry.md
deleted file mode 100644
index d3b8baf701..0000000000
--- a/.github/ISSUE_TEMPLATE/general-inquiry.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-name: General inquiry
-about: Free form communication.
-title: "[Inquiry]"
-labels: question
-assignees: ''
-
----
-
-We do encourage you to take a look at [FreeRTOS official site](https://www.freertos.org) for general information and [FreeRTOS forum](https://forums.freertos.org) to access our community.
-
-If still needed, could create a general inquiry report here.