diff --git a/.github/ISSUE_TEMPLATE/Bug_report.md b/.github/ISSUE_TEMPLATE/Bug_report.md
index ad522ec4e..a0ab5e7e3 100644
--- a/.github/ISSUE_TEMPLATE/Bug_report.md
+++ b/.github/ISSUE_TEMPLATE/Bug_report.md
@@ -4,39 +4,61 @@ about: Create a report to help us improve
 
 ---
 
-**IMPORTANT NOTICE**
-If you do not complete the template below it is likely that your issue will not be addressed. When providing information about your issue please be as extensive as possible so that it can be solved by as little as possible responses.
+<GUIDE>
 
-**FAILURE TO COMPLETE THE REQUESTED INFORMATION WILL RESULT IN YOUR ISSUE BEING CLOSED**
+<This BUG issue template is meant to REPORT Tasmota software BUGS ONLY>
+  
+<Please DO NOT OPEN AN ISSUE:>
+  <If your Tasmota version is not the latest, please update before posting. Your issue might be already solved. Latest precompiled bins of Tasmota can be downloaded from http://thehackbox.org/tasmota/>
+  <If your issue is a flashing issue, please address that to the Tasmota Support Chat>
+  <If your issue is compilation problem, please address that to the Tasmota Support Chat>
+  <If your issue has been addresed before (duplicated issue), please ask in the original issue>
+  <If your issue is wifi problem or mqtt problem, please try first the steps provided in troubleshooting of the wiki>
 
-**Describe the bug**
+### BUG DESCRIPTION
 _A clear and concise description of what the bug is._
 
 
-_Also, make sure these boxes are checked [x] before submitting your issue - Thank you!_
-- [ ] _Searched the problem in issues and in the wiki_
-- [ ] _Hardware used_ : 
-- [ ] _Development/Compiler/Upload tools used_ :
-- [ ] _If a pre-compiled release or development binary was used, which one?_ :
-- [ ] _You have tried latest release or development binaries?_ :
-- [ ] _Provide the output of command_``status 0`` :
+### REQUESTED INFORMATION
+_Make sure these boxes are checked before submitting your issue. Thank you_
+
+**FAILURE TO COMPLETE THE REQUESTED INFORMATION WILL RESULT IN YOUR ISSUE BEING CLOSED**
+
+- [ ] Read the [Contributing Guide and Policy](https://github.com/arendst/Sonoff-Tasmota/blob/development/CONTRIBUTING.md) and [the Code of Conduct](https://github.com/arendst/Sonoff-Tasmota/blob/development/CODE_OF_CONDUCT.md)
+- [ ] Searched the problem in issues (https://github.com/arendst/Sonoff-Tasmota/issues)
+- [ ] Searched the problem in the wiki (https://github.com/arendst/Sonoff-Tasmota/wiki/Troubleshooting)
+- [ ] Searched the problem in the forum (https://groups.google.com/d/forum/sonoffusers)
+- [ ] Searched the problem in the chat (https://discord.gg/Ks2Kzd4)
+- [ ] Device used (i.e. Sonoff Basic) : _____
+- [ ] Tasmota binary firmware version number used : ____ / (pre-compiled or self-compiled ?)
+- [ ] Development IDE - Compiler / Upload tools used : ____ / ____
+- [ ] Provide the output of command ``status 0`` :
 ```
-STATUS 0 OUTPUT HERE - DO NOT DELETE THE MARKERS ABOVE AND BELOW THIS LINE
+STATUS 0 OUTPUT HERE:
+
+
+```
+- [ ] Provide the output of console when you experience your issue if apply :
+_(Please use_ ``weblog 4`` _for more debug information)_
+```
+CONSOLE OUTPUT HERE:
+
+
 ```
 
-**To Reproduce**
+### TO REPRODUCE
 _Steps to reproduce the behavior:_
 
 
-**Expected behavior**
+### EXPECTED BEHAVIOUR
 _A clear and concise description of what you expected to happen._
 
 
-**Screenshots**
+### SCREENSHOTS
 _If applicable, add screenshots to help explain your problem._
 
 
-**Additional context**
+### ADDITIONAL CONTEXT
 _Add any other context about the problem here._
 
 
diff --git a/.github/ISSUE_TEMPLATE/Custom.md b/.github/ISSUE_TEMPLATE/Custom.md
index 4d1eba459..44bd847cb 100644
--- a/.github/ISSUE_TEMPLATE/Custom.md
+++ b/.github/ISSUE_TEMPLATE/Custom.md
@@ -4,24 +4,47 @@ about: Users Troubleshooting Help
 
 ---
 
-**IMPORTANT NOTICE**
-If you do not complete the template below it is likely that your issue will not be addressed. When providing information about your issue please be as extensive as possible so that it can be solved by as little as possible responses.
+<GUIDE>
+
+<This troubleshooting issue template is meant to help Tasmota users with difficult problems. It is aimed to be opened if using the wiki and the support chat could not solve the issue. The Github Issue tracker is NOT a general discussion forum>
+  
+<Please DO NOT OPEN AN ISSUE:>
+  <If you have general questions or you need help on Tasmota usage, go to the Tasmota support chat>
+  <If your Tasmota version is not the latest, please update before posting. Your issue might be already solved. Latest precompiled bins of Tasmota can be downloaded from http://thehackbox.org/tasmota/>
+  <If your issue is a new device, please use the Tasmota Template Feature. See wiki for that>
+  <If your issue is a flashing issue, please address that to the Tasmota Support Chat>
+  <If your issue is compilation problem, please address that to the Tasmota Support Chat>
+  <If your issue has been addresed before (duplicated issue), please ask in the original issue>
+  <If your issue is wifi problem or mqtt problem, please try first the steps provided in troubleshooting of the wiki>
+
+### ISSUE DESCRIPTION - TROUBLESHOOTING
+_A clear description of what the issue is and be as extensive as possible_
+  
+
+### REQUESTED INFORMATION
+_Make sure these boxes are checked before submitting your issue. Thank you_
 
 **FAILURE TO COMPLETE THE REQUESTED INFORMATION WILL RESULT IN YOUR ISSUE BEING CLOSED**
 
-Make sure these boxes are checked [x] before submitting your issue - Thank you!
-
+- [ ] Read the [Contributing Guide and Policy](https://github.com/arendst/Sonoff-Tasmota/blob/development/CONTRIBUTING.md) and [the Code of Conduct](https://github.com/arendst/Sonoff-Tasmota/blob/development/CODE_OF_CONDUCT.md)
 - [ ] Searched the problem in issues (https://github.com/arendst/Sonoff-Tasmota/issues)
 - [ ] Searched the problem in the wiki (https://github.com/arendst/Sonoff-Tasmota/wiki/Troubleshooting)
 - [ ] Searched the problem in the forum (https://groups.google.com/d/forum/sonoffusers)
 - [ ] Searched the problem in the chat (https://discord.gg/Ks2Kzd4)
-- [ ] Development/Compiler/Upload tools used :
-- [ ] Hardware used : 
-- [ ] If a pre-compiled release or development binary was used, which one? :
-- [ ] You have tried latest release or development binaries? :
+- [ ] Device used (i.e. Sonoff Basic) : _____
+- [ ] Tasmota binary firmware version number used : ____ / (pre-compiled or self-compiled ?)
+- [ ] Development IDE - Compiler / Upload tools used : ____ / ____
 - [ ] Provide the output of command ``status 0`` :
 ```
-STATUS 0 OUTPUT HERE
-```
+STATUS 0 OUTPUT HERE:
 
+
+```
+- [ ] Provide the output of console when you experience your issue if apply :
+_(Please use_ ``weblog 4`` _for more debug information)_
+```
+CONSOLE OUTPUT HERE:
+
+
+```
 **(Please, remember to close the issue when the problem has been addressed)**