diff --git a/Dockerfile b/Dockerfile
index c1c25ea..3c29bea 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -54,8 +54,8 @@ ENV DB_URL jdbc:postgresql://localhost:5432/oodb
 ENV OLAT_HOST localhost
 ENV EXTRA_PROPERTIES none
 
-RUN mkdir -p /home/openolat/conf/Catalina/localhost/
-COPY ./ROOT.xml /home/openolat/conf/Catalina/localhost/ROOT.xml
+RUN mkdir -p /home/openolat/conf/Catalina/${OLAT_HOST}/
+COPY ./ROOT.xml /home/openolat/conf/Catalina/${OLAT_HOST}/ROOT.xml
 
 COPY ./olat.local.properties /home/openolat/lib/olat.local.properties
 
diff --git a/entrypoint.sh b/entrypoint.sh
index f143a2f..035c285 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -3,8 +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/$OLAT_HOST/ROOT.xml"
+sed -i -e "s#__DB_URL__#${DB_URL}#" "/home/openolat/conf/Catalina/$OLAT_HOST/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"