diff --git a/docker-compose.yml b/docker-compose.yml
index be2b4ee..5bec83e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,6 +6,7 @@ x-common-service:
   restart: unless-stopped
   environment:
     TZ: "${TZ:-Etc/UTC}"
+    PROFILE_SERVER: "${PROFILE_SERVER:-mailserver}"
   volumes:
     - /etc/localtime:/etc/localtime:ro
 
@@ -127,7 +128,7 @@ services:
     profiles:
       - roundcube
     depends_on:
-      - mailserver
+      - ${PROFILE_SERVER:-mailserver}
     environment:
       ROUNDCUBEMAIL_DEFAULT_HOST: "${ROUNDCUBEMAIL_DEFAULT_HOST:-mail.example.com}"
       ROUNDCUBEMAIL_SMTP_SERVER: "${ROUNDCUBEMAIL_SMTP_SERVER:-mail.example.com}"
@@ -146,7 +147,7 @@ services:
     profiles:
       - rainloop
     depends_on:
-      - mailserver
+      - ${PROFILE_SERVER:-mailserver}
     environment:
       RAINLOOP_DEFAULT_HOST: "${RAINLOOP_DEFAULT_HOST:-mail.example.com}"
     volumes: