diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index cb8cd1d03..000000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,6 +0,0 @@
-Make sure these boxes are checked before submitting your issue - Thank you!
-
-- [ ] What hardware you are using
-- [ ] Provide the output of command ``status 0``
-- [ ] If you have a stack dump decode it: https://github.com/esp8266/Arduino/blob/master/doc/Troubleshooting/stack_dump.rst
-- [ ] For better debug messages: https://github.com/esp8266/Arduino/blob/master/doc/Troubleshooting/debugging.rst
diff --git a/.github/ISSUE_TEMPLATE/Bug_report.md b/.github/ISSUE_TEMPLATE/Bug_report.md
new file mode 100644
index 000000000..7dc1e3499
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Bug_report.md
@@ -0,0 +1,29 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+
+**Describe the bug**
+
+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 : 
+- [ ] Provide the output of command ``status 0`` :
+
+**To Reproduce**
+Steps to reproduce the behavior:
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Additional context**
+Add any other context about the problem here.
+
+**(Please, remember to close the issue when the problem has been addressed)**
diff --git a/.github/ISSUE_TEMPLATE/Custom.md b/.github/ISSUE_TEMPLATE/Custom.md
new file mode 100644
index 000000000..62e47446d
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Custom.md
@@ -0,0 +1,16 @@
+---
+name: Troubleshooting
+about: Users Troubleshooting Help
+
+---
+
+Make sure these boxes are checked [x] before submitting your issue - Thank you!
+
+- [ ] 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://forum.digital-pig.com/)
+- [ ] Searched the problem in the discussion group (https://groups.google.com/d/forum/sonoffusers)
+- [ ] Hardware used : 
+- [ ] Provide the output of command ``status 0`` :
+
+**(Please, remember to close the issue when the problem has been addressed)**
diff --git a/.github/ISSUE_TEMPLATE/Feature_request.md b/.github/ISSUE_TEMPLATE/Feature_request.md
new file mode 100644
index 000000000..8a0895c8e
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+**Have you look for this feature in other issues and in the wiki?**
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is.
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
+
+**(Please, remember to close the issue when the problem has been addressed)**