diff --git a/pica-mattermost/docker-compose.yml b/pica-mattermost/docker-compose.yml
index f1c151856aa6245b30fb39894d77fbbb5647c955..1d819538242b5cf9e206bf6835b58b1e1211c298 100644
--- a/pica-mattermost/docker-compose.yml
+++ b/pica-mattermost/docker-compose.yml
@@ -27,6 +27,7 @@ services:
       - /etc/localtime:/etc/localtime:ro
     environment:
       - DB_HOST=mattermost-db
+      - MM_SITEURL=team.picasoft.net
     env_file: ./secrets/mattermost-db.secrets
     labels:
       - "traefik.frontend.rule=Host:team.picasoft.net"
diff --git a/pica-mattermost/entrypoint.sh b/pica-mattermost/entrypoint.sh
index 3e571675d1521fc2a0c7c89aaeafb7be9f3b3d33..821cc64a33ad7d8b60f94a5c06ef8045cf7dd336 100644
--- a/pica-mattermost/entrypoint.sh
+++ b/pica-mattermost/entrypoint.sh
@@ -10,6 +10,7 @@ DB_HOST=${DB_HOST:-db}
 DB_PORT_NUMBER=${DB_PORT_NUMBER:-5432}
 MM_DBNAME=${MM_DBNAME:-mattermost}
 MM_CONFIG=${MM_CONFIG:-/mattermost/config/config.json}
+MM_SITEURL=${MM_SITEURL:-team.picasoft.net}
 
 if [ "${1:0:1}" = '-' ]; then
     set -- mattermost "$@"
@@ -33,6 +34,7 @@ if [ "$1" = 'mattermost' ]; then
     # Copy default configuration file
     cp /config.json.save $MM_CONFIG
     # Substitue some parameters with jq
+    jq '.ServiceSettings.SiteURL = "'${MM_SITEURL}'"' $MM_CONFIG > $MM_CONFIG.tmp && mv $MM_CONFIG.tmp $MM_CONFIG
     jq '.ServiceSettings.ListenAddress = ":8000"' $MM_CONFIG > $MM_CONFIG.tmp && mv $MM_CONFIG.tmp $MM_CONFIG
     jq '.LogSettings.EnableConsole = true' $MM_CONFIG > $MM_CONFIG.tmp && mv $MM_CONFIG.tmp $MM_CONFIG
     jq '.LogSettings.ConsoleLevel = "ERROR"' $MM_CONFIG > $MM_CONFIG.tmp && mv $MM_CONFIG.tmp $MM_CONFIG