diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 6fd55a7..499d50e 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -19,13 +19,24 @@ https://github.com/esp8266/Arduino/blob/master/doc/Troubleshooting/debugging.rst
 ### Basic Infos
 
 #### Hardware
-WiFimanager Branch/Release:  Development
+WiFimanager Branch/Release:
+- [ ] Master
+- [ ] Development
 
-Esp8266/Esp32: 
+Esp8266/Esp32:
+- [ ] ESP8266
+- [ ] ESP32
 
 Hardware:			ESP-12e, esp01, esp25
+- [ ] ESP01
+- [ ] ESP12 E/F/S (nodemcu, wemos, feather)
+- [ ] Other
 
-Core Version:      	2.4.0, staging
+
+ESP Core Version:	2.4.0, staging
+- [ ] 2.3.0
+- [ ] 2.4.0
+- [ ] staging (master/dev)
 
 ### Description