diff --git a/docker-compose.yml b/docker-compose.yml
index 8f126e4b..26400c58 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -28,8 +28,6 @@ services:
         build:
             # Custom image for file permissions
             context: ./docker/mysql
-            #context: ./docker/postgres
-            #context: ./docker/mariadb
             args:
                 USER_UID: ${USER_UID}
         ports:
@@ -55,8 +53,8 @@ services:
             MYSQL_HOST: db
             MYSQL_USER: db_user
             MYSQL_PASSWORD: db_password
-        links:
-            - db:db
+        depends_on:
+            - db
         networks:
             - frontproxynet
             - default
@@ -104,7 +102,7 @@ services:
         networks:
             - default
 
-    app:
+    app: &app_template
         # Need to pass all vars to docker env for Crontab and supervisor scripts
         env_file: "./.env.local"
         build:
@@ -113,12 +111,8 @@ services:
                 USER_UID: ${USER_UID}
         depends_on:
             - db
-            - db_test
             - solr
             - redis
-        links:
-            - solr:solr
-            - redis:redis
         volumes:
             - ./:/var/www/html:cached
         networks:
@@ -130,28 +124,17 @@ services:
             DEFAULT_GATEWAY: ${DEFAULT_GATEWAY}
 
     worker:
-        extends:
-            service: app
+        <<: *app_template
         deploy:
             replicas: 1
         entrypoint: ["php", "/var/www/html/bin/console", "messenger:consume", "async", "--time-limit=60"]
         restart: unless-stopped
-        depends_on:
-            - db
-            - solr
-            - redis
 
     cron:
-        extends:
-            service: app
+        <<: *app_template
         # https://github.com/dubiousjim/dcron/issues/13#issuecomment-1406937781
         init: true
         entrypoint: ["crond", "-f", "-L", "15"]
-        restart: unless-stopped
-        depends_on:
-            - db
-            - solr
-            - redis
 
     nginx:
         image: roadiz/nginx-alpine:latest
@@ -159,8 +142,6 @@ services:
             - ${PUBLIC_APP_PORT}:80/tcp
         depends_on:
             - app
-        links:
-            - app:app
         volumes:
             - ./:/var/www/html:cached
         networks: