diff --git a/Base/Dockerfile b/Base/Dockerfile
index 6b4478933..a430bbe26 100644
--- a/Base/Dockerfile
+++ b/Base/Dockerfile
@@ -195,7 +195,7 @@ ENV SE_BIND_HOST="false" \
     SE_STRUCTURED_LOGS="false" \
     SE_ENABLE_TRACING="true" \
     SE_ENABLE_TLS="false" \
-    SE_JAVA_OPTS_DEFAULT="-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/opt/selenium/logs" \
+    SE_JAVA_OPTS_DEFAULT="" \
     SE_JAVA_HEAP_DUMP="false" \
     SE_JAVA_HTTPCLIENT_VERSION="HTTP_1_1" \
     SE_JAVA_SSL_TRUST_STORE="/opt/selenium/secrets/server.jks" \
diff --git a/Distributor/start-selenium-grid-distributor.sh b/Distributor/start-selenium-grid-distributor.sh
index 38b82d64e..278e92bcb 100755
--- a/Distributor/start-selenium-grid-distributor.sh
+++ b/Distributor/start-selenium-grid-distributor.sh
@@ -186,18 +186,21 @@ if [ -n "${SE_JAVA_OPTS_DEFAULT}" ]; then
   SE_JAVA_OPTS="${SE_JAVA_OPTS_DEFAULT} $SE_JAVA_OPTS"
 fi
 
-if [ -n "${JAVA_OPTS:-$SE_JAVA_OPTS}" ]; then
-  echo "Using JAVA_OPTS: ${JAVA_OPTS:-$SE_JAVA_OPTS}"
-fi
-
 function handle_heap_dump() {
   /opt/bin/handle_heap_dump.sh /opt/selenium/logs
 }
 if [ "${SE_JAVA_HEAP_DUMP}" = "true" ]; then
+  SE_JAVA_OPTS="$SE_JAVA_OPTS -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/opt/selenium/logs"
   trap handle_heap_dump ERR SIGTERM SIGINT
 fi
 
-java ${JAVA_OPTS:-$SE_JAVA_OPTS} \
+if [ -n "${JAVA_OPTS}" ]; then
+  SE_JAVA_OPTS="$SE_JAVA_OPTS ${JAVA_OPTS}"
+fi
+
+echo "Using JAVA_OPTS: ${SE_JAVA_OPTS}"
+
+java ${SE_JAVA_OPTS} \
   -jar /opt/selenium/selenium-server.jar \
   ${EXTRA_LIBS} \
   distributor \
diff --git a/EventBus/start-selenium-grid-eventbus.sh b/EventBus/start-selenium-grid-eventbus.sh
index 92aed121e..205f4751d 100755
--- a/EventBus/start-selenium-grid-eventbus.sh
+++ b/EventBus/start-selenium-grid-eventbus.sh
@@ -116,18 +116,21 @@ if [ -n "${SE_JAVA_OPTS_DEFAULT}" ]; then
   SE_JAVA_OPTS="${SE_JAVA_OPTS_DEFAULT} $SE_JAVA_OPTS"
 fi
 
-if [ -n "${JAVA_OPTS:-$SE_JAVA_OPTS}" ]; then
-  echo "Using JAVA_OPTS: ${JAVA_OPTS:-$SE_JAVA_OPTS}"
-fi
-
 function handle_heap_dump() {
   /opt/bin/handle_heap_dump.sh /opt/selenium/logs
 }
 if [ "${SE_JAVA_HEAP_DUMP}" = "true" ]; then
+  SE_JAVA_OPTS="$SE_JAVA_OPTS -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/opt/selenium/logs"
   trap handle_heap_dump ERR SIGTERM SIGINT
 fi
 
-java ${JAVA_OPTS:-$SE_JAVA_OPTS} \
+if [ -n "${JAVA_OPTS}" ]; then
+  SE_JAVA_OPTS="$SE_JAVA_OPTS ${JAVA_OPTS}"
+fi
+
+echo "Using JAVA_OPTS: ${SE_JAVA_OPTS}"
+
+java ${SE_JAVA_OPTS} \
   -jar /opt/selenium/selenium-server.jar \
   ${EXTRA_LIBS} event-bus \
   --bind-host ${SE_BIND_HOST} \
diff --git a/Hub/start-selenium-grid-hub.sh b/Hub/start-selenium-grid-hub.sh
index c1e9d69a1..6f5fd62d9 100755
--- a/Hub/start-selenium-grid-hub.sh
+++ b/Hub/start-selenium-grid-hub.sh
@@ -166,18 +166,21 @@ if [ -n "${SE_JAVA_OPTS_DEFAULT}" ]; then
   SE_JAVA_OPTS="${SE_JAVA_OPTS_DEFAULT} $SE_JAVA_OPTS"
 fi
 
-if [ -n "${JAVA_OPTS:-$SE_JAVA_OPTS}" ]; then
-  echo "Using JAVA_OPTS: ${JAVA_OPTS:-$SE_JAVA_OPTS}"
-fi
-
 function handle_heap_dump() {
   /opt/bin/handle_heap_dump.sh /opt/selenium/logs
 }
 if [ "${SE_JAVA_HEAP_DUMP}" = "true" ]; then
+  SE_JAVA_OPTS="$SE_JAVA_OPTS -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/opt/selenium/logs"
   trap handle_heap_dump ERR SIGTERM SIGINT
 fi
 
-java ${JAVA_OPTS:-$SE_JAVA_OPTS} \
+if [ -n "${JAVA_OPTS}" ]; then
+  SE_JAVA_OPTS="$SE_JAVA_OPTS ${JAVA_OPTS}"
+fi
+
+echo "Using JAVA_OPTS: ${SE_JAVA_OPTS}"
+
+java ${SE_JAVA_OPTS} \
   -jar /opt/selenium/selenium-server.jar \
   ${EXTRA_LIBS} \
   hub \
diff --git a/NodeBase/start-selenium-node.sh b/NodeBase/start-selenium-node.sh
index fde2b43e3..2b003e386 100755
--- a/NodeBase/start-selenium-node.sh
+++ b/NodeBase/start-selenium-node.sh
@@ -181,18 +181,21 @@ if [ -n "${SE_JAVA_OPTS_DEFAULT}" ]; then
   SE_JAVA_OPTS="${SE_JAVA_OPTS_DEFAULT} $SE_JAVA_OPTS"
 fi
 
-if [ -n "${JAVA_OPTS:-$SE_JAVA_OPTS}" ]; then
-  echo "Using JAVA_OPTS: ${JAVA_OPTS:-$SE_JAVA_OPTS}"
-fi
-
 function handle_heap_dump() {
   /opt/bin/handle_heap_dump.sh /opt/selenium/logs
 }
 if [ "${SE_JAVA_HEAP_DUMP}" = "true" ]; then
+  SE_JAVA_OPTS="$SE_JAVA_OPTS -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/opt/selenium/logs"
   trap handle_heap_dump ERR SIGTERM SIGINT
 fi
 
-java ${JAVA_OPTS:-$SE_JAVA_OPTS} \
+if [ -n "${JAVA_OPTS}" ]; then
+  SE_JAVA_OPTS="$SE_JAVA_OPTS ${JAVA_OPTS}"
+fi
+
+echo "Using JAVA_OPTS: ${SE_JAVA_OPTS}"
+
+java ${SE_JAVA_OPTS} \
   ${CHROME_DRIVER_PATH_PROPERTY} \
   ${EDGE_DRIVER_PATH_PROPERTY} \
   ${GECKO_DRIVER_PATH_PROPERTY} \
diff --git a/NodeDocker/start-selenium-grid-docker.sh b/NodeDocker/start-selenium-grid-docker.sh
index c235af8f9..197e48654 100755
--- a/NodeDocker/start-selenium-grid-docker.sh
+++ b/NodeDocker/start-selenium-grid-docker.sh
@@ -133,18 +133,21 @@ if [ -n "${SE_JAVA_OPTS_DEFAULT}" ]; then
   SE_JAVA_OPTS="${SE_JAVA_OPTS_DEFAULT} $SE_JAVA_OPTS"
 fi
 
-if [ -n "${JAVA_OPTS:-$SE_JAVA_OPTS}" ]; then
-  echo "Using JAVA_OPTS: ${JAVA_OPTS:-$SE_JAVA_OPTS}"
-fi
-
 function handle_heap_dump() {
   /opt/bin/handle_heap_dump.sh /opt/selenium/logs
 }
 if [ "${SE_JAVA_HEAP_DUMP}" = "true" ]; then
+  SE_JAVA_OPTS="$SE_JAVA_OPTS -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/opt/selenium/logs"
   trap handle_heap_dump ERR SIGTERM SIGINT
 fi
 
-java ${JAVA_OPTS:-$SE_JAVA_OPTS} \
+if [ -n "${JAVA_OPTS}" ]; then
+  SE_JAVA_OPTS="$SE_JAVA_OPTS ${JAVA_OPTS}"
+fi
+
+echo "Using JAVA_OPTS: ${SE_JAVA_OPTS}"
+
+java ${SE_JAVA_OPTS} \
   -jar /opt/selenium/selenium-server.jar \
   ${EXTRA_LIBS} node \
   --publish-events tcp://"${SE_EVENT_BUS_HOST}":${SE_EVENT_BUS_PUBLISH_PORT} \
diff --git a/Router/start-selenium-grid-router.sh b/Router/start-selenium-grid-router.sh
index 58469bbe3..2f1a25c20 100755
--- a/Router/start-selenium-grid-router.sh
+++ b/Router/start-selenium-grid-router.sh
@@ -167,18 +167,21 @@ if [ -n "${SE_JAVA_OPTS_DEFAULT}" ]; then
   SE_JAVA_OPTS="${SE_JAVA_OPTS_DEFAULT} $SE_JAVA_OPTS"
 fi
 
-if [ -n "${JAVA_OPTS:-$SE_JAVA_OPTS}" ]; then
-  echo "Using JAVA_OPTS: ${JAVA_OPTS:-$SE_JAVA_OPTS}"
-fi
-
 function handle_heap_dump() {
   /opt/bin/handle_heap_dump.sh /opt/selenium/logs
 }
 if [ "${SE_JAVA_HEAP_DUMP}" = "true" ]; then
+  SE_JAVA_OPTS="$SE_JAVA_OPTS -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/opt/selenium/logs"
   trap handle_heap_dump ERR SIGTERM SIGINT
 fi
 
-java ${JAVA_OPTS:-$SE_JAVA_OPTS} \
+if [ -n "${JAVA_OPTS}" ]; then
+  SE_JAVA_OPTS="$SE_JAVA_OPTS ${JAVA_OPTS}"
+fi
+
+echo "Using JAVA_OPTS: ${SE_JAVA_OPTS}"
+
+java ${SE_JAVA_OPTS} \
   -jar /opt/selenium/selenium-server.jar \
   ${EXTRA_LIBS} router \
   --sessions-host "${SE_SESSIONS_MAP_HOST}" --sessions-port "${SE_SESSIONS_MAP_PORT}" \
diff --git a/SessionQueue/start-selenium-grid-session-queue.sh b/SessionQueue/start-selenium-grid-session-queue.sh
index 0a99ee587..b336ee2a7 100755
--- a/SessionQueue/start-selenium-grid-session-queue.sh
+++ b/SessionQueue/start-selenium-grid-session-queue.sh
@@ -120,18 +120,21 @@ if [ -n "${SE_JAVA_OPTS_DEFAULT}" ]; then
   SE_JAVA_OPTS="${SE_JAVA_OPTS_DEFAULT} $SE_JAVA_OPTS"
 fi
 
-if [ -n "${JAVA_OPTS:-$SE_JAVA_OPTS}" ]; then
-  echo "Using JAVA_OPTS: ${JAVA_OPTS:-$SE_JAVA_OPTS}"
-fi
-
 function handle_heap_dump() {
   /opt/bin/handle_heap_dump.sh /opt/selenium/logs
 }
 if [ "${SE_JAVA_HEAP_DUMP}" = "true" ]; then
+  SE_JAVA_OPTS="$SE_JAVA_OPTS -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/opt/selenium/logs"
   trap handle_heap_dump ERR SIGTERM SIGINT
 fi
 
-java ${JAVA_OPTS:-$SE_JAVA_OPTS} \
+if [ -n "${JAVA_OPTS}" ]; then
+  SE_JAVA_OPTS="$SE_JAVA_OPTS ${JAVA_OPTS}"
+fi
+
+echo "Using JAVA_OPTS: ${SE_JAVA_OPTS}"
+
+java ${SE_JAVA_OPTS} \
   -jar /opt/selenium/selenium-server.jar \
   ${EXTRA_LIBS} sessionqueue \
   --session-request-timeout ${SE_SESSION_REQUEST_TIMEOUT} \
diff --git a/Sessions/start-selenium-grid-sessions.sh b/Sessions/start-selenium-grid-sessions.sh
index 771f86b79..0d3daae0e 100755
--- a/Sessions/start-selenium-grid-sessions.sh
+++ b/Sessions/start-selenium-grid-sessions.sh
@@ -155,18 +155,21 @@ if [ -n "${SE_JAVA_OPTS_DEFAULT}" ]; then
   SE_JAVA_OPTS="${SE_JAVA_OPTS_DEFAULT} $SE_JAVA_OPTS"
 fi
 
-if [ -n "${JAVA_OPTS:-$SE_JAVA_OPTS}" ]; then
-  echo "Using JAVA_OPTS: ${JAVA_OPTS:-$SE_JAVA_OPTS}"
-fi
-
 function handle_heap_dump() {
   /opt/bin/handle_heap_dump.sh /opt/selenium/logs
 }
 if [ "${SE_JAVA_HEAP_DUMP}" = "true" ]; then
+  SE_JAVA_OPTS="$SE_JAVA_OPTS -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/opt/selenium/logs"
   trap handle_heap_dump ERR SIGTERM SIGINT
 fi
 
-java ${JAVA_OPTS:-$SE_JAVA_OPTS} \
+if [ -n "${JAVA_OPTS}" ]; then
+  SE_JAVA_OPTS="$SE_JAVA_OPTS ${JAVA_OPTS}"
+fi
+
+echo "Using JAVA_OPTS: ${SE_JAVA_OPTS}"
+
+java ${SE_JAVA_OPTS} \
   -jar /opt/selenium/selenium-server.jar \
   ${EXTRA_LIBS} sessions \
   --publish-events tcp://"${SE_EVENT_BUS_HOST}":${SE_EVENT_BUS_PUBLISH_PORT} \
diff --git a/Standalone/start-selenium-standalone.sh b/Standalone/start-selenium-standalone.sh
index c90cb7301..9bfa9415b 100755
--- a/Standalone/start-selenium-standalone.sh
+++ b/Standalone/start-selenium-standalone.sh
@@ -169,18 +169,21 @@ if [ -n "${SE_JAVA_OPTS_DEFAULT}" ]; then
   SE_JAVA_OPTS="${SE_JAVA_OPTS_DEFAULT} $SE_JAVA_OPTS"
 fi
 
-if [ -n "${JAVA_OPTS:-$SE_JAVA_OPTS}" ]; then
-  echo "Using JAVA_OPTS: ${JAVA_OPTS:-$SE_JAVA_OPTS}"
-fi
-
 function handle_heap_dump() {
   /opt/bin/handle_heap_dump.sh /opt/selenium/logs
 }
 if [ "${SE_JAVA_HEAP_DUMP}" = "true" ]; then
+  SE_JAVA_OPTS="$SE_JAVA_OPTS -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/opt/selenium/logs"
   trap handle_heap_dump ERR SIGTERM SIGINT
 fi
 
-java ${JAVA_OPTS:-$SE_JAVA_OPTS} \
+if [ -n "${JAVA_OPTS}" ]; then
+  SE_JAVA_OPTS="$SE_JAVA_OPTS ${JAVA_OPTS}"
+fi
+
+echo "Using JAVA_OPTS: ${SE_JAVA_OPTS}"
+
+java ${SE_JAVA_OPTS} \
   ${CHROME_DRIVER_PATH_PROPERTY} \
   ${EDGE_DRIVER_PATH_PROPERTY} \
   ${GECKO_DRIVER_PATH_PROPERTY} \
diff --git a/StandaloneDocker/start-selenium-grid-docker.sh b/StandaloneDocker/start-selenium-grid-docker.sh
index 9a008539c..ac47e1931 100755
--- a/StandaloneDocker/start-selenium-grid-docker.sh
+++ b/StandaloneDocker/start-selenium-grid-docker.sh
@@ -134,18 +134,21 @@ if [ -n "${SE_JAVA_OPTS_DEFAULT}" ]; then
   SE_JAVA_OPTS="${SE_JAVA_OPTS_DEFAULT} $SE_JAVA_OPTS"
 fi
 
-if [ -n "${JAVA_OPTS:-$SE_JAVA_OPTS}" ]; then
-  echo "Using JAVA_OPTS: ${JAVA_OPTS:-$SE_JAVA_OPTS}"
-fi
-
 function handle_heap_dump() {
   /opt/bin/handle_heap_dump.sh /opt/selenium/logs
 }
 if [ "${SE_JAVA_HEAP_DUMP}" = "true" ]; then
+  SE_JAVA_OPTS="$SE_JAVA_OPTS -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/opt/selenium/logs"
   trap handle_heap_dump ERR SIGTERM SIGINT
 fi
 
-java ${JAVA_OPTS:-$SE_JAVA_OPTS} \
+if [ -n "${JAVA_OPTS}" ]; then
+  SE_JAVA_OPTS="$SE_JAVA_OPTS ${JAVA_OPTS}"
+fi
+
+echo "Using JAVA_OPTS: ${SE_JAVA_OPTS}"
+
+java ${SE_JAVA_OPTS} \
   -jar /opt/selenium/selenium-server.jar \
   ${EXTRA_LIBS} standalone \
   --session-request-timeout ${SE_SESSION_REQUEST_TIMEOUT} \