diff --git a/abra.sh b/abra.sh
index 97025d2..c77e954 100644
--- a/abra.sh
+++ b/abra.sh
@@ -1,4 +1,4 @@
-export CORE_ENTRYPOINT_CONF_VERSION=v5
+export CORE_ENTRYPOINT_CONF_VERSION=v6
 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 ee14470..5fb7b34 100644
--- a/compose.yml
+++ b/compose.yml
@@ -22,10 +22,9 @@ services:
       - DATABASE_HOST=${STACK_NAME}_db
       - DATABASE_NAME=mailman
       - DATABASE_PASSWORD_FILE=/run/secrets/db_password
-      - DATABASE_TYPE=postgres
+      - DATABASE_TYPE=postgresql
       - DATABASE_USER=mailman
       - HYPERKITTY_API_KEY_FILE=/run/secrets/hyperkitty_api_key
-      - MAILMAN_HOSTNAME=mailman-core
       - MAILMAN_REST_PASSWORD_FILE=/run/secrets/mailman_rest_password
       - MAILMAN_REST_USER=restadmin
       - MTA=postfix
@@ -101,7 +100,7 @@ services:
         - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`)"
         - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
         - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
-        - "coop-cloud.${STACK_NAME}.version=0.2.0+1.28.0"
+        - "coop-cloud.${STACK_NAME}.version=0.2.1+1.28.0"
 
   db:
     image: "postgres:13-alpine"
diff --git a/entrypoint.core.sh.tmpl b/entrypoint.core.sh.tmpl
index 6295017..311608a 100755
--- a/entrypoint.core.sh.tmpl
+++ b/entrypoint.core.sh.tmpl
@@ -32,7 +32,7 @@ file_env "DATABASE_PASSWORD"
 file_env "HYPERKITTY_API_KEY"
 file_env "MAILMAN_REST_PASSWORD"
 
-export DATABASE_URL="postgres://${DATABASE_USER}:${DATABASE_PASSWORD}@${DATABASE_HOST}/${DATABASE_NAME}"
+export DATABASE_URL="postgresql://${DATABASE_USER}:${DATABASE_PASSWORD}@${DATABASE_HOST}/${DATABASE_NAME}"
 
 # Diabolical hack to remove duplicate hostnames due to Docker shared networks
 # See https://git.autonomic.zone/coop-cloud/mailu/src/branch/main/compose.yml for more
@@ -274,7 +274,7 @@ echo "HYPERKITTY_API_KEY not defined, skipping HyperKitty setup..."
 fi
 
 # Generate the LMTP files for postfix if needed.
-mailman aliases
+su-exec mailman mailman aliases
 
 # Now chown the places where mailman wants to write stuff.
 chown -Rf mailman /opt/mailman || true