diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 6806b48..af87304 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -7,7 +7,10 @@ assignees: ''
 
 ---
 
-### Your System
+### Before reporting an issue
+Check the [Wiki pages](https://github.com/EmanuelFeru/hoverboard-firmware-hack-FOC/wiki), there are hints for troubleshooting.
+
+### Describe your System so we can help you better
 - VARIANT:
 - CONTROL TYPE:
 - CONTROL MODE:
diff --git a/.github/ISSUE_TEMPLATE/idea---feature-request.md b/.github/ISSUE_TEMPLATE/idea---feature-request.md
index b1259ea..224da5e 100644
--- a/.github/ISSUE_TEMPLATE/idea---feature-request.md
+++ b/.github/ISSUE_TEMPLATE/idea---feature-request.md
@@ -7,8 +7,12 @@ assignees: ''
 
 ---
 
-**What can we do to make the firmware better?**
+### Before suggesting a feature
+Check the [Wiki pages](https://github.com/EmanuelFeru/hoverboard-firmware-hack-FOC/wiki), it might already be available.<br>
+Also make sure this feature wasn't requested already.
+
+### What can we do to make the firmware better?
 Consider if code examples or images would help communicate your request.
 
-**Describe suggestions or alternatives you have considered**
+### Describe suggestions or alternatives you have considered
 A clear and concise description of any alternative solutions or features you've considered.
diff --git a/.github/ISSUE_TEMPLATE/question-about-the-firmware.md b/.github/ISSUE_TEMPLATE/question-about-the-firmware.md
index 2443656..de5f9a2 100644
--- a/.github/ISSUE_TEMPLATE/question-about-the-firmware.md
+++ b/.github/ISSUE_TEMPLATE/question-about-the-firmware.md
@@ -7,17 +7,17 @@ assignees: ''
 
 ---
 
-### Your System
+### Before asking a question
+See if it is already answered in [Wiki pages](https://github.com/EmanuelFeru/hoverboard-firmware-hack-FOC/wiki)
+
+### Describe your System so we can help you better
 - VARIANT:
 - CONTROL TYPE:
 - CONTROL MODE:
 - What is your application?
     - Hovercar, Skateboard, RC platform, etc.
 
-**Before asking a question** see if it is already answered in:
-* [Wiki pages](https://github.com/EmanuelFeru/hoverboard-firmware-hack-FOC/wiki)
-
-**Indicate what you have tried:**
+### Indicate what you have tried
 If applicable, indicate what you tried that _doesn't_ work:
 
 ```c