diff --git a/openvidu-server/docker/openvidu-docker-compose/.env b/openvidu-server/docker/openvidu-docker-compose/.env
index a1330949..ce7c8632 100644
--- a/openvidu-server/docker/openvidu-docker-compose/.env
+++ b/openvidu-server/docker/openvidu-docker-compose/.env
@@ -135,3 +135,10 @@ OPENVIDU_CDR=false
 # the verbosity level of the logs of Openvidu Service
 # RECOMENDED VALUES: INFO for normal logs DEBUG for more verbose logs
 # OV_CE_DEBUG_LEVEL=INFO
+
+# Java Options
+# --------------------------
+# Uncomment the next line and define this to add
+# options to java command
+# Documentation: https://docs.oracle.com/cd/E37116_01/install.111210/e23737/configuring_jvm.htm#OUDIG00058
+# JAVA_OPTIONS=-Xms2048m -Xmx4096m
diff --git a/openvidu-server/docker/openvidu-server-pro/entrypoint.sh b/openvidu-server/docker/openvidu-server-pro/entrypoint.sh
index 31a02984..9b068676 100755
--- a/openvidu-server/docker/openvidu-server-pro/entrypoint.sh
+++ b/openvidu-server/docker/openvidu-server-pro/entrypoint.sh
@@ -12,4 +12,8 @@ if [ ! -z "${WAIT_KIBANA_URL}" ]; then
   done
 fi
 
-java -jar openvidu-server.jar
+if [ ! -z "${JAVA_OPTIONS}" ]; then
+    echo "Using java options: ${JAVA_OPTIONS}"
+fi
+
+java ${JAVA_OPTIONS:-} -jar openvidu-server.jar
diff --git a/openvidu-server/docker/openvidu-server/Dockerfile b/openvidu-server/docker/openvidu-server/Dockerfile
index 2c0fbf14..eb0c7635 100644
--- a/openvidu-server/docker/openvidu-server/Dockerfile
+++ b/openvidu-server/docker/openvidu-server/Dockerfile
@@ -9,8 +9,9 @@ RUN apt-get update && apt-get install -y \
 
 # Copy OpenVidu Server
 COPY openvidu-server.jar /
+COPY ./entrypoint.sh /usr/local/bin
+RUN chmod +x /usr/local/bin/entrypoint.sh
 
 EXPOSE 4443
 
-# Exec supervisord
-CMD ["java", "-jar", "openvidu-server.jar"]
+CMD /usr/local/bin/entrypoint.sh
diff --git a/openvidu-server/docker/openvidu-server/entrypoint.sh b/openvidu-server/docker/openvidu-server/entrypoint.sh
new file mode 100644
index 00000000..88900a6f
--- /dev/null
+++ b/openvidu-server/docker/openvidu-server/entrypoint.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+if [ ! -z "${JAVA_OPTIONS}" ]; then
+    echo "Using java options: ${JAVA_OPTIONS}"
+fi
+
+java ${JAVA_OPTIONS:-} -jar openvidu-server.jar