diff --git a/abra-mattermost-entrypoint.sh b/abra-mattermost-entrypoint.sh
index 1ca31bc..9ca2f50 100644
--- a/abra-mattermost-entrypoint.sh
+++ b/abra-mattermost-entrypoint.sh
@@ -6,10 +6,9 @@ if test -f "/run/secrets/postgres_password"; then
         echo >&2 "error: /run/secrets/postgres_password is empty"
         exit 1
     fi
-    echo "abra-mattermost-entrypoint.sh setting POSTGRES_PASSWORD ${pwd}"
+    echo "abra-mattermost-entrypoint.sh setting POSTGRES_PASSWORD and MM_SQLSETTINGS_DATASOURCE"
     export "POSTGRES_PASSWORD"="$pwd"
     export "MM_SQLSETTINGS_DATASOURCE"="postgres://mattermost:${pwd}@postgres:5432/mattermost?sslmode=disable&connect_timeout=10"
-    echo "CONNECTION_STRING: ${MM_SQLSETTINGS_DATASOURCE}"
     unset "pwd"
 else
     echo >&2 "error: /run/secrets/postgres_password does not exist"
diff --git a/docker-compose.yml b/docker-compose.yml
index 2b89c2e..9fdef20 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,8 +17,10 @@ services:
 
       # necessary Postgres options/variables
       - POSTGRES_USER=mattermost
-      - POSTGRES_PASSWORD=mysupersecretpassword
+      - POSTGRES_PASSWORD_FILE=/run/secrets/postgres_password
       - POSTGRES_DB=mattermost
+    secrets:
+      - postgres_password
     networks:
       - internal
 
@@ -42,7 +44,6 @@ services:
 
       # necessary Mattermost options/variables (see env.sample)
       - MM_SQLSETTINGS_DRIVERNAME=postgres
-#      - MM_SQLSETTINGS_DATASOURCE=postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@postgres:5432/${POSTGRES_DB}?sslmode=disable&connect_timeout=10
 
       # additional settings
       - MM_SERVICESETTINGS_SITEURL=https://${DOMAIN}