diff --git a/docker-compose.yml b/docker-compose.yml
index 0b1a6c4f..0bb42d94 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '2'
 
 services:
-    pdns:
+    pdns-mailcow:
       image: andryyy/mailcow-dockerized:pdns
       volumes:
         - ./data/conf/pdns/:/etc/powerdns/
@@ -9,8 +9,10 @@ services:
       networks:
         mailcow-network:
           ipv4_address: 172.22.1.254
+          aliases:
+            - pdns
 
-    mysql:
+    mysql-mailcow:
       image: mariadb:10.1
       depends_on:
         - pdns
@@ -29,8 +31,10 @@ services:
       restart: always
       networks:
         mailcow-network:
+          aliases:
+            - mysql
 
-    redis:
+    redis-mailcow:
       image: redis
       depends_on:
         - pdns
@@ -42,8 +46,10 @@ services:
       dns_search: mailcow-network
       networks:
         mailcow-network:
+          aliases:
+            - redis
 
-    rspamd:
+    rspamd-mailcow:
       image: andryyy/mailcow-dockerized:rspamd
       depends_on:
         - pdns
@@ -59,8 +65,10 @@ services:
       dns_search: mailcow-network
       networks:
         mailcow-network:
+          aliases:
+            - rspamd
 
-    phpfpm:
+    php-fpm-mailcow:
       image: andryyy/mailcow-dockerized:phpfpm
       command: "php-fpm -d date.timezone=${TZ}"
       depends_on:
@@ -80,8 +88,10 @@ services:
       restart: always
       networks:
         mailcow-network:
+          aliases:
+            - phpfpm
 
-    sogo:
+    sogo-mailcow:
       image: andryyy/mailcow-dockerized:sogo
       depends_on:
         - pdns
@@ -100,8 +110,10 @@ services:
       restart: always
       networks:
         mailcow-network:
+          aliases:
+            - sogo
 
-    rmilter:
+    rmilter-mailcow:
       image: andryyy/mailcow-dockerized:rmilter
       depends_on:
         - pdns
@@ -113,8 +125,10 @@ services:
       dns_search: mailcow-network
       networks:
         mailcow-network:
+          aliases:
+            - rmilter
 
-    dovecot:
+    dovecot-mailcow:
       image: andryyy/mailcow-dockerized:dovecot
       depends_on:
         - pdns
@@ -140,8 +154,10 @@ services:
       hostname: ${MAILCOW_HOSTNAME}
       networks:
         mailcow-network:
+          aliases:
+            - dovecot
 
-    postfix:
+    postfix-mailcow:
       image: andryyy/mailcow-dockerized:postfix
       depends_on:
         - pdns
@@ -163,8 +179,10 @@ services:
       dns_search: mailcow-network
       networks:
         mailcow-network:
+          aliases:
+            - postfix
 
-    memcached:
+    memcached-mailcow:
       image: memcached
       depends_on:
         - pdns
@@ -174,8 +192,10 @@ services:
       dns_search: mailcow-network
       networks:
         mailcow-network:
+          aliases:
+            - memcached
 
-    nginx:
+    nginx-mailcow:
       depends_on:
         - mysql
         - sogo
@@ -198,6 +218,8 @@ services:
       restart: always
       networks:
         mailcow-network:
+          aliases:
+            - nginx
 
 networks:
   mailcow-network: