diff --git a/nextcloud/docker-compose.config.yml b/nextcloud/docker-compose.config.yml
index f7491ce..2dfecac 100644
--- a/nextcloud/docker-compose.config.yml
+++ b/nextcloud/docker-compose.config.yml
@@ -1,4 +1,5 @@
 ---
+
 version: "3.8"
 
 services:
diff --git a/nextcloud/docker-compose.local.yml b/nextcloud/docker-compose.local.yml
index f6bd168..7a6ea13 100644
--- a/nextcloud/docker-compose.local.yml
+++ b/nextcloud/docker-compose.local.yml
@@ -1,3 +1,5 @@
+---
+
 version: "3.8"
 
 services:
diff --git a/nextcloud/docker-compose.postgres.yml b/nextcloud/docker-compose.postgres.yml
new file mode 100644
index 0000000..1bf8b14
--- /dev/null
+++ b/nextcloud/docker-compose.postgres.yml
@@ -0,0 +1,18 @@
+---
+
+version: "3.8"
+
+services:
+  nextcloud-fpm:
+    depends_on:
+      - postgres
+    environment:
+      &postgres-configuration
+      POSTGRES_HOST: ${POSTGRES_CONTAINER_NAME:-postgres} # Default name is same as ../postgres/docker-compose.yml:8
+      POSTGRES_USER: ${POSTGRES_USER:?err}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:?err}
+      POSTGRES_DB: ${POSTGRES_DB:?err}
+
+  nextcloud-cron:
+    environment:
+      <<: *postgres-configuration
diff --git a/nextcloud/docker-compose.redis.yml b/nextcloud/docker-compose.redis.yml
new file mode 100644
index 0000000..7f7be97
--- /dev/null
+++ b/nextcloud/docker-compose.redis.yml
@@ -0,0 +1,15 @@
+---
+
+version: "3.8"
+
+services:
+  nextcloud-fpm:
+    depends_on:
+      - redis
+    environment:
+      &redis-configuration
+      REDIS_HOST: ${REDIS_CONTAINER_NAME:-redis} # Default name is same as ../redis/docker-compose.yml:4
+
+  nextcloud-cron:
+    environment:
+      <<: *redis-configuration
diff --git a/nextcloud/docker-compose.smtp.yml b/nextcloud/docker-compose.smtp.yml
index 25809d8..40c1a15 100644
--- a/nextcloud/docker-compose.smtp.yml
+++ b/nextcloud/docker-compose.smtp.yml
@@ -1,3 +1,5 @@
+---
+
 version: "3.8"
 
 services:
diff --git a/nextcloud/docker-compose.traefik.yml b/nextcloud/docker-compose.traefik.yml
index 4e869a2..f383350 100644
--- a/nextcloud/docker-compose.traefik.yml
+++ b/nextcloud/docker-compose.traefik.yml
@@ -1,3 +1,5 @@
+---
+
 version: "3.8"
 
 networks:
diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml
index 351eb38..23eb63a 100644
--- a/nextcloud/docker-compose.yml
+++ b/nextcloud/docker-compose.yml
@@ -1,3 +1,5 @@
+---
+
 version: "3.8"
 
 volumes:
@@ -9,9 +11,6 @@ services:
     container_name: ${NEXTCLOUD_CONTAINER_NAME:-nextcloud}-fpm
     image: ${NEXTCLOUD_IMAGE:-nextcloud:25.0.2-fpm-alpine}
     restart: always
-    depends_on:
-      - postgres
-      - redis
     volumes:
       - nextcloud:/var/www/html
       - /etc/timezone:/etc/timezone:ro
@@ -23,11 +22,6 @@ services:
       NEXTCLOUD_ADMIN_PASSWORD: ${NEXTCLOUD_ADMIN_PASSWORD?err}
       OVERWRITEPROTOCOL: ${OVERWRITEPROTOCOL:-https}
       PHP_UPLOAD_LIMIT: ${PHP_UPLOAD_LIMIT:-512M}
-      POSTGRES_HOST: ${POSTGRES_CONTAINER_NAME:-postgres} # Default name is same as ../postgres/docker-compose.yml:8
-      POSTGRES_USER: ${POSTGRES_USER:?err}
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:?err}
-      POSTGRES_DB: ${POSTGRES_DB:?err}
-      REDIS_HOST: ${REDIS_CONTAINER_NAME:-redis} # Default name is same as ../redis/docker-compose.yml:4
       PUID: ${NEXTCLOUD_PUID:-1000}
       PGID: ${NEXTCLOUD_PGID:-1000}