diff --git a/002-build-pdns.sh b/002-build-pdns.sh
index b0a18535..ef11abc2 100755
--- a/002-build-pdns.sh
+++ b/002-build-pdns.sh
@@ -14,5 +14,6 @@ docker run \
 	-v ${PWD}/data/conf/pdns/:/etc/powerdns/ \
 	--network=${DOCKER_NETWORK} \
 	-h pdns \
+	--network-alias=pdns \
 	--name ${NAME} \
 	-d andryyy/mailcow-dockerized:pdns
diff --git a/003-build-sql.sh b/003-build-sql.sh
index dba79c3e..c7a4459f 100755
--- a/003-build-sql.sh
+++ b/003-build-sql.sh
@@ -88,6 +88,7 @@ docker run \
 	--name=${NAME} \
 	--network=${DOCKER_NETWORK} \
 	-h mysql \
+	--network-alias=mysql \
 	-e MYSQL_ROOT_PASSWORD=${DBROOT} \
 	-e MYSQL_DATABASE=${DBNAME} \
 	-e MYSQL_USER=${DBUSER} \
diff --git a/004-build-redis.sh b/004-build-redis.sh
index b0cd6046..70c4b42d 100755
--- a/004-build-redis.sh
+++ b/004-build-redis.sh
@@ -33,6 +33,7 @@ fi
 docker run \
 	-v ${PWD}/data/db/redis/:/data/ \
 	--network=${DOCKER_NETWORK} \
+	--network-alias=redis \
 	-h redis \
 	--name=${NAME} \
 	-d redis:${REDISVERS} --appendonly yes
diff --git a/006-build-php-fpm.sh b/006-build-php-fpm.sh
index ce68bc0d..8bbe3214 100755
--- a/006-build-php-fpm.sh
+++ b/006-build-php-fpm.sh
@@ -23,6 +23,7 @@ docker run \
     -v ${PWD}/data/dkim/:/shared/dkim/ \
 	-d --network=${DOCKER_NETWORK} \
 	--name ${NAME} \
+	--network-alias=phpfpm \
 	-h phpfpm \
 	php:${PHPVERS}
 
diff --git a/007-build-nginx.sh b/007-build-nginx.sh
index e0efdefc..055a5695 100755
--- a/007-build-nginx.sh
+++ b/007-build-nginx.sh
@@ -32,6 +32,7 @@ docker run \
 	-v ${PWD}/data/conf/nginx/:/etc/nginx/conf.d/:ro \
 	--network=${DOCKER_NETWORK} \
 	-h nginx \
+	--network-alias=nginx \
 	-d nginx:${NGINXVERS}
 
 echo "Installaing SOGo web resource files..."
diff --git a/008-build-rmilter.sh b/008-build-rmilter.sh
index 0bec168f..f26dedbe 100755
--- a/008-build-rmilter.sh
+++ b/008-build-rmilter.sh
@@ -14,5 +14,6 @@ docker run \
 	-v ${PWD}/data/conf/rmilter/:/etc/rmilter.conf.d/:ro \
 	--network=${DOCKER_NETWORK} \
 	-h rmilter \
+	--network-alias=rmilter
 	--name ${NAME} \
 	-d andryyy/mailcow-dockerized:rmilter
diff --git a/011-build-memcached.sh b/011-build-memcached.sh
index 6e73aef5..6ea44275 100755
--- a/011-build-memcached.sh
+++ b/011-build-memcached.sh
@@ -21,5 +21,6 @@ fi
 docker run \
 	--network=${DOCKER_NETWORK} \
 	-h memcached \
+	--network-alias=memcached \
 	--name=${NAME} \
 	-d memcached