diff --git a/Dockerfile b/Dockerfile
index b1b51c2..c1c25ea 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,8 +5,8 @@ RUN apt-get install -y curl unzip locales
 
 RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && \
     locale-gen
-ENV LANG en_US.UTF-8  
-ENV LANGUAGE en_US:en  
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
 ENV LC_ALL en_US.UTF-8
 
 RUN useradd -m -s /bin/bash openolat
@@ -52,6 +52,7 @@ ENV JRE_HOME /home/openolat/jre
 ENV DB_PASSWORD default
 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
diff --git a/README.md b/README.md
index 76cf02b..344237d 100644
--- a/README.md
+++ b/README.md
@@ -7,3 +7,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`
+- `EXTRA_PROPERTIES`, default `none`
diff --git a/entrypoint.sh b/entrypoint.sh
index 2d5025d..f143a2f 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -9,4 +9,8 @@ sed -i -e "s#__DB_URL__#${DB_URL}#" "/home/openolat/conf/Catalina/localhost/ROOT
 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"
 
+if [ "$EXTRA_PROPERTIES" != "none" ]; then
+    cat "$EXTRA_PROPERTIES" >> "/home/openolat/lib/olat.local.properties"
+fi
+
 exec /home/openolat/tomcat/bin/catalina.sh run