diff --git a/Dockerfile b/Dockerfile
index 42fc36f..b1b51c2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -51,6 +51,7 @@ ENV JRE_HOME /home/openolat/jre
 
 ENV DB_PASSWORD default
 ENV DB_URL jdbc:postgresql://localhost:5432/oodb
+ENV OLAT_HOST localhost
 
 RUN mkdir -p /home/openolat/conf/Catalina/localhost/
 COPY ./ROOT.xml /home/openolat/conf/Catalina/localhost/ROOT.xml
diff --git a/README.md b/README.md
index 41e6f8b..76cf02b 100644
--- a/README.md
+++ b/README.md
@@ -6,3 +6,4 @@ https://docs.openolat.org/manual_admin/installation/installGuide/
 
 - `DB_PASSWORD`, default `default`
 - `DB_URL`, default `jdbc:postgresql://localhost:5432/oodb`
+- `OLAT_HOST`, default `localhost`
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 3f709c3..cd30496 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -21,4 +21,4 @@ services:
       - olatnetwork
 
 networks:
-  olatnetwork:
\ No newline at end of file
+  olatnetwork:
diff --git a/entrypoint.sh b/entrypoint.sh
index 7e60e54..48879a1 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -3,7 +3,8 @@
 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/__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"
 
 exec /home/openolat/tomcat/bin/catalina.sh run
diff --git a/server.xml b/server.xml
index eb49025..3d1cfc0 100644
--- a/server.xml
+++ b/server.xml
@@ -2,8 +2,8 @@
 <Server port="8085" shutdown="SHUTDOWN">
   <Service name="Catalina">
     <Connector port="8088" protocol="HTTP/1.1" />
-    <Engine name="Catalina" defaultHost="localhost">
-      <Host name="localhost"  appBase="webapps" />
+    <Engine name="Catalina" defaultHost="__HOST__">
+      <Host name="__HOST__"  appBase="webapps" />
     </Engine>
   </Service>
 </Server>