diff --git a/bitnami/spark/3.2/debian-11/Dockerfile b/bitnami/spark/3.2/debian-11/Dockerfile
index a751ec1c6c8f..fb0ffea603db 100644
--- a/bitnami/spark/3.2/debian-11/Dockerfile
+++ b/bitnami/spark/3.2/debian-11/Dockerfile
@@ -5,7 +5,7 @@ ARG TARGETARCH
 
 LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
       org.opencontainers.image.description="Application packaged by Bitnami" \
-      org.opencontainers.image.ref.name="3.2.2-debian-11-r35" \
+      org.opencontainers.image.ref.name="3.2.2-debian-11-r36" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/spark" \
       org.opencontainers.image.title="spark" \
       org.opencontainers.image.vendor="VMware, Inc." \
diff --git a/bitnami/spark/3.2/debian-11/rootfs/opt/bitnami/scripts/spark/entrypoint.sh b/bitnami/spark/3.2/debian-11/rootfs/opt/bitnami/scripts/spark/entrypoint.sh
index eebd41c70a58..054d4065b165 100755
--- a/bitnami/spark/3.2/debian-11/rootfs/opt/bitnami/scripts/spark/entrypoint.sh
+++ b/bitnami/spark/3.2/debian-11/rootfs/opt/bitnami/scripts/spark/entrypoint.sh
@@ -43,6 +43,14 @@ case "$1" in
     ;;
   executor)
     shift 1
+
+    set +o pipefail
+
+    env | grep SPARK_JAVA_OPT_ | sort -t_ -k4 -n | sed 's/[^=]*=\(.*\)/\1/g' > /tmp/java_opts.txt
+    readarray -t SPARK_EXECUTOR_JAVA_OPTS < /tmp/java_opts.txt
+
+    set -o pipefail
+
     CMD=(
       ${JAVA_HOME}/bin/java
       "${SPARK_EXECUTOR_JAVA_OPTS[@]}"