diff --git a/issue_template.md b/issue_template.md
index 3377504e6..5219a4f7e 100644
--- a/issue_template.md
+++ b/issue_template.md
@@ -1,5 +1,9 @@
 ### Affected apps
 Tell us which app(s) you are talking about
+### Steps to reproduce
+1.
+2.
+3.
 
 ### Expected behaviour
 Tell us what should happen
@@ -7,26 +11,81 @@ Tell us what should happen
 ### Actual behaviour
 Tell us what happens instead
 
-### Steps to reproduce
-1. 
-2. 
-3. 
-
 ### Server configuration
-Operating system:
+<!--
+You can use the Issue Template application to prefill most of the required information: https://apps.nextcloud.com/apps/issuetemplate
+-->
+
+**Operating system**:
+
+**Web server:**
+
+**Database:**
+
+**PHP version:**
+
+**Server version:** (see your admin page)
 
-Web server: 
+**Calendar version:** (see the apps page)
 
-Database:
+**Updated from an older installed version or fresh install:**
 
-PHP version:
+**Signing status (ownCloud/Nextcloud 9.0 and above):**
 
-ownCloud version:
+```
+Login as admin user into your cloud and access
+http://example.com/index.php/settings/integrity/failed
+paste the results here.
+```
+
+**List of activated apps:**
+
+```
+If you have access to your command line run e.g.:
+sudo -u www-data php occ app:list
+from within your instance's installation folder
+```
+
+**Nextcloud configuration:**
+
+```
+If you have access to your command line run e.g.:
+sudo -u www-data php occ config:list system
+from within your instance's installation folder
+
+or
+
+Insert your config.php content here
+Make sure to remove all sensitive content such as passwords. (e.g. database password, passwordsalt, secret, smtp password, …)
+```
+
+**Are you using external storage, if yes which one:** local/smb/sftp/...
+
+**Are you using encryption:** yes/no
+
+**Are you using an external user-backend, if yes which one:** LDAP/ActiveDirectory/Webdav/...
+
+#### LDAP configuration (delete this part if not used)
+
+```
+With access to your command line run e.g.:
+sudo -u www-data php occ ldap:show-config
+from within your instance's installation folder
+
+Without access to your command line download the data/owncloud.db to your local
+computer or access your SQL server remotely and run the select query:
+SELECT * FROM `oc_appconfig` WHERE `appid` = 'user_ldap';
+
+
+Be sure to replace sensitive data as the name/IP-address of your LDAP server or groups.
+```
 
 ### Client configuration
-Browser:
+**Browser:**
+
+**Operating system:**
 
-Operating system:
+**CalDAV-clients:**
 
 ### Logs
 #### Web server error log
@@ -34,9 +93,9 @@ Operating system:
 Insert your webserver log here
 ```
 
-#### ownCloud log (data/owncloud.log)
+#### Log file (data/nextcloud.log)
 ```
-Insert your ownCloud log here
+Insert your nextcloud.log file here
 ```
 
 #### Browser log
@@ -44,6 +103,6 @@ Insert your ownCloud log here
 Insert your browser log here, this could for example include:
 
 a) The javascript console log
-b) The network log 
+b) The network log
 c) ...
 ```