diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index cb161a49..423d897f 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,24 +1,31 @@
+<!-- Delete any not relevant section in this template -->
+
 # Environment
- 
- * Ampache version: 
- * Web server + version: 
- * Server operating system: 
- * Client operating system: 
+
+ * Ampache version:
+ * Web server + version:
+ * Server operating system:
+ * Client operating system:
+
+<!-- Keep only the affected clients in the list below. Add client application name and version on the right of the client type you use. -->
+
  * Client type:
-   - [ ] Web
-   - [ ] Ampache
-   - [ ] SubSonic
-   - [ ] Plex
-   - [ ] DAAP
-   - [ ] UPnP
-   - [ ] WebDAV
- * Client application + version: 
- 
+   - Web
+   - Ampache
+   - SubSonic
+   - Plex
+   - DAAP
+   - UPnP
+   - WebDAV
+
 # Settings
-Describe your settings or attach ampache.cfg.php after removing sensitive information (server host, database connection...)
+
+<!-- Put here a description of your settings or attach ampache.cfg.php after removing sensitive information (server host, database connection...) -->
 
 # Description
-Here the bug/feature description and how to reproduce/integrate it.
+
+<!-- Put here the bug/feature description and how to reproduce/integrate it. -->
 
 # Logs
-[Ampache logs](https://github.com/ampache/ampache/wiki/Troubleshooting#enable-logging) and web server access/error logs in attached files. Please also add client application logs if appropriate.
\ No newline at end of file
+
+<!-- [Ampache logs](https://github.com/ampache/ampache/wiki/Troubleshooting#enable-logging) and web server access/error logs in attached files. Please also add client application logs if appropriate. -->