diff --git a/entrypoint.sh b/entrypoint.sh
index 48879a1..2d5025d 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -3,8 +3,10 @@
 set -euo pipefail
 
 
-sed -i -e "s/__PASSWORD__/${DB_PASSWORD}/ /home/openolat/conf/Catalina/localhost/ROOT.xml"
-sed -i -e "s#__DB_URL__#${DB_URL}# /home/openolat/conf/Catalina/localhost/ROOT.xml"
-sed -i -e "s#__HOST__#${OLAT_HOST}# /home/openolat/conf/server.xml"
+sed -i -e "s#__PASSWORD__#${DB_PASSWORD}#" "/home/openolat/conf/Catalina/localhost/ROOT.xml"
+sed -i -e "s#__DB_URL__#${DB_URL}#" "/home/openolat/conf/Catalina/localhost/ROOT.xml"
+
+sed -i -e "s#__HOST__#${OLAT_HOST}#" "/home/openolat/conf/server.xml"
+sed -i -e "s#__HOST__#${OLAT_HOST}#" "/home/openolat/lib/olat.local.properties"
 
 exec /home/openolat/tomcat/bin/catalina.sh run
diff --git a/olat.local.properties b/olat.local.properties
index b791f85..a2246f2 100644
--- a/olat.local.properties
+++ b/olat.local.properties
@@ -4,7 +4,7 @@ db.vendor=postgresql
 installation.dir=/home/openolat
 log.dir=/home/openolat/logs
 server.contextpath=/openolat
-server.domainname=localhost
+server.domainname=__HOST__
 server.port=8088
 server.port.ssl=0
 smtp.host=disabled