diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 28dd965678..ede6d5ee5c 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,13 +1,24 @@
-Please include the following information when submitting a bug report/issue:
+<!-- 
+	== Github Issues are for bug reports and feature requests only ==
+	== Please visit https://community.nodebb.org for other support ==
+-->
 
-* NodeBB version and git hash (to find your git hash, execute `git rev-parse HEAD` from the main NodeBB directory)
-* Database (mongo or redis) and it's version.
-* Exact steps to cause this issue
-    1. First I did this...
-    2. Then, I clicked on this item...
-* What you expected
-    * e.g. I expected *abc* to *xyz*
-* What happened instead
-    * e.g. Instead, I got *zyx* and NodeBB set fire to my house
+<!-- ++ Please include the following information when submitting a bug report ++ -->
 
-Thank you!
+- **NodeBB version:** 
+- **NodeBB git hash:** 
+<!-- (to find your git hash, execute `git rev-parse HEAD` from the main NodeBB directory) -->
+- **Database type:** mongo or redis
+- **Database version:** 
+<!-- `mongod --version` or `redis-server --version` -->
+- **Exact steps to cause this issue:**
+<!--
+	1. First I did this...
+	2. Then, I clicked on this item...
+-->
+- **What you expected:**
+<!-- e.g. I expected *abc* to *xyz* -->
+- **What happened instead:**
+<!-- e.g. Instead, I got *zyx* and NodeBB set fire to my house -->
+
+<!-- Thank you! -->