diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index c2032970..00000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,33 +0,0 @@
-Make sure you read and understand http://nodemcu.readthedocs.io/en/dev/en/support/.
-Use one of the two templates below and **DELETE THE REST**.
-
-8<------------------------ BUG REPORT -----------------------------------------
-### Expected behavior
-
-### Actual behavior
-
-### Test code
-Provide a [Minimal, Complete, and Verifiable example](http://stackoverflow.com/help/mcve) which will reproduce the problem.
-```Lua
--- add code here
-```
-### NodeMCU version
-Which branch are you on? If you know the Git revision then add it here as well.
-
-### Hardware
-Describe which ESP8266 device you use and document any special hardware setup
-required to reproduce the problem.
-
-8<------------------------ END BUG REPORT -------------------------------------
-
-
-8<------------------------ FEATURE REQUEST ------------------------------------
-### Missing feature
-
-### Justification
-Tell us why you would like to see this feature added.
-
-### Workarounds
-Are there any workarounds you currently have in place because the feature is missing?
-
-8<------------------------ END FEATURE REQUEST --------------------------------
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 00000000..0f1f4a34
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,24 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+### Expected behavior
+
+### Actual behavior
+
+### Test code
+Provide a [Minimal, Complete, and Verifiable example](http://stackoverflow.com/help/mcve) which will reproduce the problem.
+```Lua
+-- add code here
+```
+### NodeMCU startup banner
+You MUST include the firmware startup banner to describe the version you are using. We reserve the right to immediately close any bug that doesn't.
+
+### Hardware
+Describe which ESP8266/ESP32 device you use and document any special hardware setup
+required to reproduce the problem.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 00000000..516a5c98
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,17 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+### Missing feature
+See issue #1010 and note that we reserve the right to close feature requests if the originating poster is not proposing to resource the development him or herself.
+
+### Justification
+Tell us why you would like to see this feature added.
+
+### Workarounds
+Are there any workarounds you currently have in place because the feature is missing?
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
new file mode 100644
index 00000000..8c043611
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -0,0 +1,16 @@
+---
+name: Question
+about: Use Stack Overflow instead
+title: "\U0001F649"
+labels: ''
+assignees: ''
+
+---
+
+🛑 𝙎𝙏𝙊𝙋
+
+This issue tracker is not the place for questions!
+
+If you want to ask how to do something, or to understand why something isn't working the way you expect it to, see https://nodemcu.readthedocs.io/en/latest/support/
+
+We close all questions without reading them.
\ No newline at end of file