diff --git a/apps/mattermost/.env b/apps/mattermost/.env
index 55f5449f4..ee4452edb 100644
--- a/apps/mattermost/.env
+++ b/apps/mattermost/.env
@@ -8,8 +8,9 @@ W9_DIST=community
 W9_ID=mattermost
 W9_HTTP_PORT=8065
 W9_HTTP_PORT_SET=9001
+
+W9_URL=appname.example.com
 W9_URL_REPLACE=true
-W9_URL=appname.example.com:$W9_HTTP_PORT_SET
 W9_DB_EXPOSE="postgresql"
 W9_NETWORK=websoft9
 #### --------------------------------------------------------------------------------------- ####
@@ -17,11 +18,7 @@ W9_NETWORK=websoft9
 
 # -- below from official .env
 
-POSTGRES_USER=$W9_ID
-POSTGRES_PASSWORD=$W9_POWER_PASSWORD
-POSTGRES_DB=$W9_ID
-
 MM_BLEVESETTINGS_INDEXDIR=/mattermost/bleve-indexes
 MM_SQLSETTINGS_DRIVERNAME=postgres
 MM_SQLSETTINGS_DATASOURCE=postgres://${W9_ID}:${W9_POWER_PASSWORD}@$W9_ID-postgresql:5432/${W9_ID}?sslmode=disable&connect_timeout=10
-MM_SERVICESETTINGS_SITEURL=http://${W9_URL}
\ No newline at end of file
+MM_SERVICESETTINGS_SITEURL=http://${W9_URL}:$W9_HTTP_PORT_SET
\ No newline at end of file