diff --git a/README.md b/README.md
index 6e1d86c..c306ed5 100644
--- a/README.md
+++ b/README.md
@@ -62,12 +62,15 @@ services:
     networks:
       - backend
     ports:
-      - "127.0.0.1:8080:80"
+      - "127.0.0.1:8008:80"    # WebApp & EAS (alt. HTTP)
+      - "127.0.0.1:110:110"    # POP3 (not needed if all devices can use EAS)
+      - "127.0.0.1:143:143"    # IMAP (not needed if all devices can use EAS)
+      - "127.0.0.1:8080:8080"  # CalDAV (not needed if all devices can use EAS)
     depends_on:
       - auth
       - db
       - mta
-    environment:
+    environment: # Virgin config, ignored on restarts unless FORCE_CONFIG given.
       - USER_PLUGIN=ldap
       - LDAP_URI=ldap://auth:389/
       - MYSQL_HOST=db
@@ -78,13 +81,19 @@ services:
       - MYSQL_DATABASE=${MYSQL_DATABASE-kopano}
       - MYSQL_USER=${MYSQL_USER-kopano}
       - MYSQL_PASSWORD=${MYSQL_PASSWORD-secret}
+      - POP3_LISTEN=*:110                       # also listen to eth0
+      - IMAP_LISTEN=*:143                       # also listen to eth0
+      - ICAL_LISTEN=*:8080                      # also listen to eth0
+      - DISABLED_FEATURES=${DISABLED_FEATURES-} # also enable IMAP and POP3
       - SYSLOG_LEVEL=${SYSLOG_LEVEL-3}
     volumes:
       - app-conf:/etc/kopano
       - app-atch:/var/lib/kopano/attachments
       - app-sync:/var/lib/z-push
-      - app-spam:/var/lib/kopano/spamd     # kopano-spamd integration
-      - /etc/localtime:/etc/localtime:ro    # Use host timezone
+      - app-spam:/var/lib/kopano/spamd          # kopano-spamd integration
+      - /etc/localtime:/etc/localtime:ro        # Use host timezone
+    cap_add: # helps debugging by allowing strace
+      - sys_ptrace
 
   mta:
     image: mlan/postfix-amavis
@@ -92,18 +101,20 @@ services:
     networks:
       - backend
     ports:
-      - "127.0.0.1:25:25"
+      - "127.0.0.1:25:25"      # SMTP
     depends_on:
       - auth
-    environment:
+    environment: # Virgin config, ignored on restarts unless FORCE_CONFIG given.
       - LDAP_HOST=auth
       - VIRTUAL_TRANSPORT=lmtp:app:2003
       - LDAP_USER_BASE=ou=${LDAP_USEROU-users},${LDAP_BASE-dc=example,dc=com}
       - LDAP_QUERY_FILTER_USER=(&(objectclass=${LDAP_USEROBJ-posixAccount})(mail=%s))
     volumes:
       - mta:/srv
-      - app-spam:/var/lib/kopano/spamd     # kopano-spamd integration
-      - /etc/localtime:/etc/localtime:ro    # Use host timezone
+      - app-spam:/var/lib/kopano/spamd          # kopano-spamd integration
+      - /etc/localtime:/etc/localtime:ro        # Use host timezone
+    cap_add: # helps debugging by allowing strace
+      - sys_ptrace
 
   db:
     image: mariadb
@@ -118,7 +129,7 @@ services:
       - MYSQL_PASSWORD=${MYSQL_PASSWORD-secret}
     volumes:
       - db:/var/lib/mysql
-      - /etc/localtime:/etc/localtime:ro    # Use host timezone
+      - /etc/localtime:/etc/localtime:ro        # Use host timezone
 
   auth:
     image: mlan/openldap
@@ -128,7 +139,7 @@ services:
       - LDAP_LOGLEVEL=parse
     volumes:
       - auth:/srv
-      - /etc/localtime:/etc/localtime:ro    # Use host timezone
+      - /etc/localtime:/etc/localtime:ro        # Use host timezone
 
 networks:
   backend:
diff --git a/demo/docker-compose.yml b/demo/docker-compose.yml
index bad1bc6..a4c542d 100644
--- a/demo/docker-compose.yml
+++ b/demo/docker-compose.yml
@@ -7,9 +7,9 @@ services:
       - backend
     ports:
       - "127.0.0.1:8008:80"    # WebApp & EAS (alt. HTTP)
-      - "127.0.0.1:110:110"    # POP3
-      - "127.0.0.1:143:143"    # IMAP
-      - "127.0.0.1:8080:8080"  # CalDAV/iCAL
+      - "127.0.0.1:110:110"    # POP3 (not needed if all devices can use EAS)
+      - "127.0.0.1:143:143"    # IMAP (not needed if all devices can use EAS)
+      - "127.0.0.1:8080:8080"  # CalDAV (not needed if all devices can use EAS)
     depends_on:
       - auth
       - db
@@ -34,9 +34,9 @@ services:
       - app-conf:/etc/kopano
       - app-atch:/var/lib/kopano/attachments
       - app-sync:/var/lib/z-push
-      - app-spam:/var/lib/kopano/spamd      # kopano-spamd integration
-      - /etc/localtime:/etc/localtime:ro    # Use host timezone
-    cap_add: # helps debugging by alowing strace
+      - app-spam:/var/lib/kopano/spamd          # kopano-spamd integration
+      - /etc/localtime:/etc/localtime:ro        # Use host timezone
+    cap_add: # helps debugging by allowing strace
       - sys_ptrace
 
   mta:
@@ -65,9 +65,9 @@ services:
       - RAZOR_REGISTRATION=${RAZOR_REGISTRATION-}
     volumes:
       - mta:/srv
-      - app-spam:/var/lib/kopano/spamd     # kopano-spamd integration
-      - /etc/localtime:/etc/localtime:ro    # Use host timezone
-    cap_add: # helps debugging by alowing strace
+      - app-spam:/var/lib/kopano/spamd          # kopano-spamd integration
+      - /etc/localtime:/etc/localtime:ro        # Use host timezone
+    cap_add: # helps debugging by allowing strace
       - sys_ptrace
 
   db:
@@ -83,7 +83,7 @@ services:
       - MYSQL_PASSWORD=${MYSQL_PASSWORD-secret}
     volumes:
       - db:/var/lib/mysql
-      - /etc/localtime:/etc/localtime:ro    # Use host timezone
+      - /etc/localtime:/etc/localtime:ro        # Use host timezone
 
   auth:
     image: mlan/openldap
@@ -93,7 +93,7 @@ services:
       - LDAP_LOGLEVEL=parse
     volumes:
       - auth:/srv
-      - /etc/localtime:/etc/localtime:ro    # Use host timezone
+      - /etc/localtime:/etc/localtime:ro        # Use host timezone
 
 networks:
   backend: