diff --git a/roles/docker-nextcloud/README.md b/roles/docker-nextcloud/README.md
index 24c7ede7..466cd1ba 100644
--- a/roles/docker-nextcloud/README.md
+++ b/roles/docker-nextcloud/README.md
@@ -50,7 +50,7 @@ If nextcloud stays in the maintenance mode after the update try the following:
 If the update process fails execute
 
 ```bash
-  docker-compose exec -it -u www-data application /var/www/html/occ maintenance:repair
+  docker-compose exec -it -u www-data application /var/www/html/occ maintenance:repair --include-expensive
 ```
 
 and disable the not functioning apps.
diff --git a/roles/docker-nextcloud/templates/docker-compose.yml.j2 b/roles/docker-nextcloud/templates/docker-compose.yml.j2
index e894ff53..64fed804 100644
--- a/roles/docker-nextcloud/templates/docker-compose.yml.j2
+++ b/roles/docker-nextcloud/templates/docker-compose.yml.j2
@@ -13,6 +13,8 @@ services:
     volumes:
       - data:/var/www/html
     environment:
+      # See https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/config_sample_php_parameters.html
+
       # Database Configuration
       MYSQL_DATABASE: "{{database_name}}"
       MYSQL_USER: "{{database_username}}"
@@ -24,16 +26,15 @@ services:
       
       # Email Configuration
       SMTP_HOST: {{system_email_host}}
-      SMTP_SECURE: {{ 'ssl' if system_email_start_tls else 'tls' }}
+      SMTP_SECURE: {{ 'ssl' if system_email_tls else '' }}
       SMTP_PORT: {{system_email_smtp_port}}
       SMTP_NAME: {{system_email_username}}
       SMTP_PASSWORD: {{system_email_password}}
 
       # Email from configuration
-      # MAIL_FROM_ADDRESS: no-reply
-      # MAIL_DOMAIN: {{domain}}
+      MAIL_FROM_ADDRESS: no-reply
+      MAIL_DOMAIN: {{system_email_host}}
 
-At least SMTP_HOST, MAIL_FROM_ADDRESS and MAIL_DOMAIN must be set for the configurations to be applied.
 {% include 'templates/docker/container/depends-on-database-redis.yml.j2' %}
 {% include 'templates/docker/container/networks.yml.j2' %}