diff --git a/docker-compose.yml b/docker-compose.yml
index 9126e6b..a450d0c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,13 +1,10 @@
 version: '3'
 
 services:
-  nextcloud-app:
+  app:
     image: pgollor/nextcloud:app-dev-latest
     restart: always
     cpus: 1.5
-    depends_on:
-      - nextcloud-database
-      - nextcloud-redis
     env_file:
       - db.env
       - cloud.env
@@ -17,17 +14,21 @@
       - MYSQL_USER=cloud
       - NEXTCLOUD_ADMIN_USER=${NEXTCLOUD_ADMIN_USER}
       - NEXTCLOUD_DATA_DIR=/srv/data
-      - REDIS_HOST=nextcloudnextcloud-redis
+      - REDIS_HOST=redis
       - TZ=${TZ}
+      - NEXTCLOUD_TRUSTED_DOMAINS=${NEXTCLOUD_TRUSTED_DOMAINS}
     tmpfs:
       - /tmp
     links:
-      - "nextcloud-database:db"
+      - "database:db"
     volumes:
-      - ./data/app:/var/www/html
+      - app-vol-1:/var/www/html
       - ./data/data:/srv/data
+    depends_on:
+      - database
+      - redis
 
-  nextcloud-web:
+  web:
     image: pgollor/nextcloud:web-latest
     restart: always
     logging:
@@ -35,13 +36,13 @@
     ports:
       - "${NEXTCLOUD_WEB_BIND:-127.0.0.1}:${NEXTCLOUD_WEB_PORT:-8080}:80"
     volumes:
-      - ./data/app:/var/www/html:ro
+      - app-vol-1:/var/www/html:ro
     links:
-      - "nextcloud-app:app"
+      - "app:app"
     depends_on:
-      - nextcloud-app
+      - app
 
-  nextcloud-database:
+  database:
     image: mariadb
     restart: always
     command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW
@@ -51,27 +52,29 @@
     env_file:
       - db.env
     volumes:
-      -  nextcloud-db-vol-1:/var/lib/mysql/
+      -  db-vol-1:/var/lib/mysql/
       - ./data/conf/mysql:/etc/mysql/conf.d/:ro
     tmpfs:
       - /tmp
 
-  nextcloud-redis:
+  redis:
     image: redis:alpine
     restart: always
 
-  nextcloud-cron:
+  cron:
     image: nextcloud:fpm-alpine
     restart: always
     volumes:
-      - ./data/app:/var/www/html
+      - app-vol-1:/var/www/html
       - ./data/data:/srv/data
     logging:
       driver: json-file
     entrypoint: /cron.sh
     depends_on:
-      - nextcloud-database
-      - nextcloud-redis
+      - database
+      - redis
 
 volumes:
-  nextcloud-db-vol-1:
+  db-vol-1:
+  app-vol-1:
+