diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 5dd32dd6..732669d0 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,5 +1,6 @@
+<!--
 Did you read the FAQ?
-https://www.zigbee2mqtt.io/information/FAQ.md
+https://www.zigbee2mqtt.io/information/FAQ.html
 
 Unsupported device?
 https://www.zigbee2mqtt.io/how_tos/how_to_support_new_devices.html
@@ -8,9 +9,22 @@ A question?
 Read the documentation: https://www.zigbee2mqtt.io/
 
 Bug report:
-- First make sure your on the latest version of zigbee2mqtt.
+- First make sure you are on the latest version of zigbee2mqtt.
 - Make sure you are running the latest CC253X firmware from https://github.com/koenkk/z-stack-firmware.
 - Provide a clear description of the problem.
 - If applicable, provide steps how to reproduce the problem.
 - Provide a log with `log_level` set to `debug`, see https://www.zigbee2mqtt.io/configuration/configuration.html
 - DON'T copy logs directly here, post a link to https://hastebin.com/ or https://pastebin.com/.
+-->
+
+<!--Start your bug report below this line-->
+# Bug Report
+## What happened
+
+## What did you expect to happen
+
+## How to reproduce it (minimal and precise)
+
+## Debug Info
+zigbee2mqtt version:
+CC253X firmware version: