diff --git a/.env.dist b/.env.dist
index cb3a97d0..90b1ba0c 100644
--- a/.env.dist
+++ b/.env.dist
@@ -18,7 +18,8 @@ VERSION=stable
 SECRET_KEY=ChangeMeChangeMe
 
 # Address where listening ports should bind
-BIND_ADDRESS=127.0.0.1
+BIND_ADDRESS4=127.0.0.1
+BIND_ADDRESS6=::1
 
 # Main mail domain
 DOMAIN=mailu.io
@@ -94,4 +95,3 @@ COMPOSE_PROJECT_NAME=mailu
 # Default password scheme used for newly created accounts and changed passwords
 # (value: SHA512-CRYPT, SHA256-CRYPT, MD5-CRYPT, CRYPT)
 PASSWORD_SCHEME=SHA512-CRYPT
-
diff --git a/docker-compose.yml.dist b/docker-compose.yml.dist
index 35f6ac5f..54b6439f 100644
--- a/docker-compose.yml.dist
+++ b/docker-compose.yml.dist
@@ -8,15 +8,24 @@ services:
     restart: always
     env_file: .env
     ports:
-      - "$BIND_ADDRESS:80:80"
-      - "$BIND_ADDRESS:443:443"
-      - "$BIND_ADDRESS:110:110"
-      - "$BIND_ADDRESS:143:143"
-      - "$BIND_ADDRESS:993:993"
-      - "$BIND_ADDRESS:995:995"
-      - "$BIND_ADDRESS:25:25"
-      - "$BIND_ADDRESS:465:465"
-      - "$BIND_ADDRESS:587:587"
+    - "$BIND_ADDRESS4:80:80"
+    - "$BIND_ADDRESS4:443:443"
+    - "$BIND_ADDRESS4:110:110"
+    - "$BIND_ADDRESS4:143:143"
+    - "$BIND_ADDRESS4:993:993"
+    - "$BIND_ADDRESS4:995:995"
+    - "$BIND_ADDRESS4:25:25"
+    - "$BIND_ADDRESS4:465:465"
+    - "$BIND_ADDRESS4:587:587"
+    - "$BIND_ADDRESS6:80:80"
+    - "$BIND_ADDRESS6:443:443"
+    - "$BIND_ADDRESS6:110:110"
+    - "$BIND_ADDRESS6:143:143"
+    - "$BIND_ADDRESS6:993:993"
+    - "$BIND_ADDRESS6:995:995"
+    - "$BIND_ADDRESS6:25:25"
+    - "$BIND_ADDRESS6:465:465"
+    - "$BIND_ADDRESS6:587:587"  
     volumes:
       - "$ROOT/certs:/certs"