diff --git a/bitnami/spring-cloud-dataflow-composed-task-runner/2/debian-12/Dockerfile b/bitnami/spring-cloud-dataflow-composed-task-runner/2/debian-12/Dockerfile
index 4d1fcf09ddf9..08cb9e2bc008 100644
--- a/bitnami/spring-cloud-dataflow-composed-task-runner/2/debian-12/Dockerfile
+++ b/bitnami/spring-cloud-dataflow-composed-task-runner/2/debian-12/Dockerfile
@@ -9,11 +9,11 @@ ARG TARGETARCH
 
 LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \
       org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
-      org.opencontainers.image.created="2024-11-10T00:03:39Z" \
+      org.opencontainers.image.created="2024-12-10T00:34:28Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/spring-cloud-dataflow-composed-task-runner/README.md" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="2.11.5-debian-12-r3" \
+      org.opencontainers.image.ref.name="2.11.5-debian-12-r4" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/spring-cloud-dataflow-composed-task-runner" \
       org.opencontainers.image.title="spring-cloud-dataflow-composed-task-runner" \
       org.opencontainers.image.vendor="Broadcom, Inc." \
diff --git a/bitnami/spring-cloud-dataflow-composed-task-runner/2/debian-12/rootfs/opt/bitnami/scripts/java/entrypoint.sh b/bitnami/spring-cloud-dataflow-composed-task-runner/2/debian-12/rootfs/opt/bitnami/scripts/java/entrypoint.sh
index 8557631d2549..38802fc0bfe9 100755
--- a/bitnami/spring-cloud-dataflow-composed-task-runner/2/debian-12/rootfs/opt/bitnami/scripts/java/entrypoint.sh
+++ b/bitnami/spring-cloud-dataflow-composed-task-runner/2/debian-12/rootfs/opt/bitnami/scripts/java/entrypoint.sh
@@ -13,6 +13,11 @@ set -o pipefail
 . /opt/bitnami/scripts/libbitnami.sh
 . /opt/bitnami/scripts/liblog.sh
 
+if [[ "$OS_FLAVOUR" =~ photon && "$APP_VERSION" =~ ^1.8 ]]; then
+  # Option --module-path is not supported by JAVA 1.8 since modules were added in version 1.9
+  unset JAVA_TOOL_OPTIONS
+fi
+
 print_welcome_page
 
 echo ""
diff --git a/bitnami/spring-cloud-dataflow-composed-task-runner/2/debian-12/rootfs/opt/bitnami/scripts/scdf-composed-task-runner-env.sh b/bitnami/spring-cloud-dataflow-composed-task-runner/2/debian-12/rootfs/opt/bitnami/scripts/scdf-composed-task-runner-env.sh
index 940af859b1a8..eb2169383c00 100644
--- a/bitnami/spring-cloud-dataflow-composed-task-runner/2/debian-12/rootfs/opt/bitnami/scripts/scdf-composed-task-runner-env.sh
+++ b/bitnami/spring-cloud-dataflow-composed-task-runner/2/debian-12/rootfs/opt/bitnami/scripts/scdf-composed-task-runner-env.sh
@@ -25,6 +25,7 @@ export BITNAMI_DEBUG="${BITNAMI_DEBUG:-false}"
 # variable will be overridden with the value specified in that file
 scdf_composed_task_runner_env_vars=(
     JAVA_OPTS
+    JAVA_TOOL_OPTIONS
 )
 for env_var in "${scdf_composed_task_runner_env_vars[@]}"; do
     file_env_var="${env_var}_FILE"
@@ -49,5 +50,6 @@ export SCDF_COMPOSED_TASK_RUNNER_DAEMON_GROUP="dataflow"
 
 # Java settings
 export JAVA_OPTS="${JAVA_OPTS:-}"
+export JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS:-}"
 
 # Custom environment variables may be defined below
diff --git a/bitnami/spring-cloud-dataflow-composed-task-runner/README.md b/bitnami/spring-cloud-dataflow-composed-task-runner/README.md
index b07687188d7b..f233b6f23b74 100644
--- a/bitnami/spring-cloud-dataflow-composed-task-runner/README.md
+++ b/bitnami/spring-cloud-dataflow-composed-task-runner/README.md
@@ -25,7 +25,7 @@ Looking to use SCDF Composed Task Runner in production? Try [VMware Tanzu Applic
 
 ## Supported tags and respective `Dockerfile` links
 
-Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.vmware.com/en/VMware-Tanzu-Application-Catalog/services/tutorials/GUID-understand-rolling-tags-containers-index.html).
+Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://techdocs.broadcom.com/us/en/vmware-tanzu/application-catalog/tanzu-application-catalog/services/tac-doc/apps-tutorials-understand-rolling-tags-containers-index.html).
 
 You can see the equivalence between the different tags by taking a look at the `tags-info.yaml` file present in the branch folder, i.e `bitnami/ASSET/BRANCH/DISTRO/tags-info.yaml`.
 
@@ -59,9 +59,10 @@ docker build -t bitnami/APP:latest .
 
 #### Customizable environment variables
 
-| Name        | Description | Default Value |
-|-------------|-------------|---------------|
-| `JAVA_OPTS` | JVM options | `nil`         |
+| Name                | Description        | Default Value |
+|---------------------|--------------------|---------------|
+| `JAVA_OPTS`         | JVM options        | `nil`         |
+| `JAVA_TOOL_OPTIONS` | Java tool options. | `nil`         |
 
 #### Read-only environment variables