diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
index cfb80a992..5a7cb9f55 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -1,6 +1,8 @@
 ---
 name: Bug report
-about: Create a report to help us improve our code.
+about: Create a report to help us improve FreeRTOS. This should only be used for confirmed
+  bugs, if you suspect something it is best to first discuss it on the FreeRTOS community
+  support forums linked below.
 title: "[BUG]"
 labels: bug
 assignees: ''
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 000000000..55777b08d
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,6 @@
+blank_issues_enabled: false
+contact_links:
+  - name: FreeRTOS Community Support Forum
+    url: https://forums.freertos.org/
+    about: Please ask and answer questions about FreeRTOS here.
+