diff --git a/roles/docker_services/tasks/services/nextcloud.yml b/roles/docker_services/tasks/services/nextcloud.yml
index 3ee54cb..67cbdf8 100644
--- a/roles/docker_services/tasks/services/nextcloud.yml
+++ b/roles/docker_services/tasks/services/nextcloud.yml
@@ -52,16 +52,6 @@
           tmpfs:
             - /var/lib/redis
 
-        cron:
-          image: nextcloud:{{ services.nextcloud.version }}
-          restart: unless-stopped
-          entrypoint: /cron.sh
-          volumes:
-            - "{{ services.nextcloud.volume }}/app:/var/www/html:rw"
-          depends_on:
-            - postgres
-            - redis
-
         app:
           image: nextcloud:{{ services.nextcloud.version }}
           restart: unless-stopped
@@ -74,8 +64,14 @@
             REDIS_HOST_PASSWORD: "{{ secrets.nextcloud.redis_pw }}"
             MAIL_FROM_ADDRESS: noreply
             MAIL_DOMAIN: "{{ services.nextcloud.domain }}"
+            SMTP_AUTHTYPE: PLAIN
             SMTP_HOST: postfix
             SMTP_PORT: 587
+            TRUSTED_PROXIES: 172.16.3.2
+            OVERWRITEHOST: "{{ services.nextcloud.domain }}"
+            OVERWRITEPROTOCOL: https
+            OVERWRITECLIURL: https://{{ services.nextcloud.domain }}
+            NEXTCLOUD_INIT_LOCK: 'true'
             PHP_MEMORY_LIMIT: 2G
             PHP_UPLOAD_LIMIT: 16G
           networks:
@@ -92,6 +88,15 @@
             - postgres
             - redis
 
+        cron:
+          image: nextcloud:{{ services.nextcloud.version }}
+          restart: unless-stopped
+          entrypoint: /cron.sh
+          volumes:
+            - "{{ services.nextcloud.volume }}/app:/var/www/html:rw"
+          depends_on:
+            - app
+
       networks:
         postfix:
           external: true