diff --git a/docker-compose/nextcloud_ldap/docker-compose.yml.j2 b/docker-compose/nextcloud_ldap/docker-compose.yml.j2
index 7461bd74..efb9464e 100644
--- a/docker-compose/nextcloud_ldap/docker-compose.yml.j2
+++ b/docker-compose/nextcloud_ldap/docker-compose.yml.j2
@@ -75,20 +75,24 @@ services:
       - nextcloud-redis-ldap
       - nextcloud-cron-ldap
     environment:
+        # redis
         REDIS_HOST: nextcloud-redis-ldap
         REDIS_HOST_PASSWORD: "{{ lookup('keepass', 'nextcloud_redis_host_password', 'password') }}"
+        # mysql
         MYSQL_DATABASE: nextcloud
         MYSQL_USER: nextcloud
         MYSQL_PASSWORD: "{{ lookup('keepass', 'nextcloud_mysql_password', 'password') }}"
         MYSQL_HOST: nextcloud-db-ldap
-        NEXTCLOUD_TRUSTED_DOMAINS: "nextcloud.mgrote.net"
+        # mail
         SMTP_HOST: mail-relay
-        #SMTP_SECURE: tls
         SMTP_PORT: 25
-        #SMTP_AUTHTYPE: LOGIN
         SMTP_NAME: info@mgrote.net
-        #SMTP_PASSWORD: "{{ lookup('keepass', 'strato_smtp_password', 'password') }}"
         MAIL_FROM_ADDRESS: info@mgrote.net
+        # admin
+        NEXTCLOUD_ADMIN_USER: n-admin
+        NEXTCLOUD_ADMIN_PASSWORD: "{{ lookup('keepass', 'nextcloud_admin_user_password', 'password') }}"
+        # misc
+        NEXTCLOUD_TRUSTED_DOMAINS: "nextcloud.mgrote.net"
         PHP_MEMORY_LIMIT: 1024M
         PHP_UPLOAD_LIMIT: 10G
         APACHE_DISABLE_REWRITE_IP: 1
@@ -96,8 +100,6 @@ services:
         NEXTCLOUD_UPLOAD_LIMIT: 10G
         NEXTCLOUD_MAX_TIME: 3600
         APACHE_BODY_LIMIT: 0 # unlimited, https://github.com/nextcloud/docker/issues/1796
-        NEXTCLOUD_ADMIN_USER: n-admin
-        NEXTCLOUD_ADMIN_PASSWORD: "{{ lookup('keepass', 'nextcloud_admin_user_password', 'password') }}"
     volumes:
       - app-ldap:/var/www/html
       - data-ldap:/var/www/html/data