diff --git a/Dockerfile b/Dockerfile
index 49b19caf4..11bcd6316 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ MAINTAINER geosolutions<info@geo-solutions.it>
 RUN mkdir -p /docker-entrypoint.d
 # Tomcat specific options
 ENV CATALINA_BASE "$CATALINA_HOME"
-ENV JAVA_OPTS="${JAVA_OPTS} -XX:MaxRAMPercentage=80 -XX:+UseParallelGC ${JAVA_OPTIONS}"
+ENV JAVA_OPTS="${JAVA_OPTS} -XX:MaxRAMPercentage=80 -XX:+UseParallelGC"
 
 # Optionally remove Tomcat manager, docs, and examples
 ARG TOMCAT_EXTRAS=false
@@ -37,7 +37,9 @@ USER tomcat
 # COPY docker/geostore-datasource-ovr.properties "${CATALINA_BASE}/conf/"
 # ARG GEOSTORE_OVR_OPT=""
 ARG GEORCHESTRA_DATADIR_OPT="-Dgeorchestra.datadir=/etc/georchestra"
-ENV JAVA_OPTS="${JAVA_OPTS} ${GEORCHESTRA_DATADIR_OPT}"
+# geOrchestra required parameters for mapstore-geOrchestra to function properly
+ARG GEORCHESTRA_REQUIRED_OPTS="-DPRINT_BASE_URL=pdf -Dgeorchestra.extensions=/mnt/mapstore_extensions"
+ENV JAVA_OPTS="${JAVA_OPTS} ${GEORCHESTRA_DATADIR_OPT} ${GEORCHESTRA_REQUIRED_OPTS}"
 
 # Set variable to better handle terminal commands
 ENV TERM xterm
diff --git a/georchestra-docker-scripts/99-apply-java-options.sh b/georchestra-docker-scripts/99-apply-java-options.sh
new file mode 100755
index 000000000..b96e80950
--- /dev/null
+++ b/georchestra-docker-scripts/99-apply-java-options.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+# JAVA_OPTIONS gives the ability to add more parameters to JAVA_OPTS at runtime.
+
+# Exit immediately if a command exits with a non-zero status.
+set -e
+
+# Check if JAVA_OPTIONS is set and not empty
+if [ -n "$JAVA_OPTIONS" ]; then
+  echo "Applying runtime JAVA_OPTIONS: $JAVA_OPTIONS"
+  # Append JAVA_OPTIONS to JAVA_OPTS
+  export JAVA_OPTS="${JAVA_OPTS} $JAVA_OPTIONS"
+fi