diff --git a/abra.sh b/abra.sh
index 4a22f5d..f45762e 100644
--- a/abra.sh
+++ b/abra.sh
@@ -1,4 +1,4 @@
-export CORE_ENTRYPOINT_CONF_VERSION=v1
+export CORE_ENTRYPOINT_CONF_VERSION=v4
 export MAILMAN_EXTRA_CFG_VERSION=v1
 export NGINX_CONF_VERSION=v1
 export SETTINGS_LOCAL_VERSION=v2
diff --git a/compose.yml b/compose.yml
index 46a89e5..044a2f4 100644
--- a/compose.yml
+++ b/compose.yml
@@ -16,9 +16,10 @@ services:
       - hyperkitty_api_key
       - mailman_rest_password
     environment:
+      - MM_HOSTNAME=core.${SMTP_NETWORK}
       - DATABASE_CLASS=mailman.database.postgresql.PostgreSQLDatabase
       - DATABASE_DB=mailman
-      - DATABASE_HOST=db
+      - DATABASE_HOST=${STACK_NAME}_db
       - DATABASE_NAME=mailman
       - DATABASE_PASSWORD_FILE=/run/secrets/db_password
       - DATABASE_TYPE=postgres
@@ -38,6 +39,8 @@ services:
         mode: 0555
     entrypoint: /usr/local/bin/docker-entrypoint-custom.sh
     command: master --force
+    deploy:
+      endpoint_mode: dnsrr
 
   web:
     image: "maxking/mailman-web:0.3"
@@ -53,7 +56,7 @@ services:
       - hyperkitty_api_key
       - mailman_rest_password
     environment:
-      - DATABASE_HOST=db
+      - DATABASE_HOST=${STACK_NAME}_db
       - DATABASE_NAME=mailman
       - DATABASE_PASSWORD_FILE=/run/secrets/db_password
       - DATABASE_TYPE=postgres
diff --git a/entrypoint.core.sh.tmpl b/entrypoint.core.sh.tmpl
index e4fe3d1..614b216 100644
--- a/entrypoint.core.sh.tmpl
+++ b/entrypoint.core.sh.tmpl
@@ -161,7 +161,7 @@ cat >> /etc/mailman.cfg << EOF
 sleep_time: 10s
 
 [webservice]
-hostname: $MM_HOSTNAME
+hostname: 0.0.0.0
 port: $MAILMAN_REST_PORT
 admin_user: $MAILMAN_REST_USER
 admin_pass: $MAILMAN_REST_PASSWORD