diff --git a/bitnami/spring-cloud-dataflow/2/debian-11/Dockerfile b/bitnami/spring-cloud-dataflow/2/debian-11/Dockerfile
index aef78fa3a455..c3dedad5c183 100644
--- a/bitnami/spring-cloud-dataflow/2/debian-11/Dockerfile
+++ b/bitnami/spring-cloud-dataflow/2/debian-11/Dockerfile
@@ -7,20 +7,44 @@ ENV HOME="/" \
 ARG JAVA_EXTRA_SECURITY_DIR="/bitnami/java/extra-security"
 LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
       org.opencontainers.image.description="Application packaged by Bitnami" \
-      org.opencontainers.image.ref.name="2.9.4-debian-11-r32" \
+      org.opencontainers.image.ref.name="2.9.5-debian-11-r0" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/spring-cloud-dataflow" \
       org.opencontainers.image.title="spring-cloud-dataflow" \
       org.opencontainers.image.vendor="VMware, Inc." \
-      org.opencontainers.image.version="2.9.4"
+      org.opencontainers.image.version="2.9.5"
 
 COPY prebuildfs /
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 # Install required system packages and dependencies
 RUN install_packages acl ca-certificates curl gzip libc6 libgcc-s1 procps tar
-RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "java" "1.8.345-2" --checksum b244bc8c1f972d20fac8019cf97fb05ce6cd8be2034ca11f52243c8bd96aaa23
-RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "yq" "4.27.3-0" --checksum 1aa32d853f4ba273642dc4bb9fb50146434f2c44978d02e1728f72a047e50567
-RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "spring-cloud-dataflow" "2.9.4-153" --checksum 741c9a1b6b64482b07e10bba5e9df965c7a03c944772000636eee25f11bb1112
-RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-154" --checksum e36c3d90f4fbfbe989f40947fa7c8ab817f12fcf97d3aef893c753a20ce976ab
+RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
+    if [ ! -f java-1.8.345-2-linux-amd64-debian-11.tar.gz ]; then \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/java-1.8.345-2-linux-amd64-debian-11.tar.gz -O ; \
+    fi && \
+    echo "b244bc8c1f972d20fac8019cf97fb05ce6cd8be2034ca11f52243c8bd96aaa23  java-1.8.345-2-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
+    tar -zxf java-1.8.345-2-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
+    rm -rf java-1.8.345-2-linux-amd64-debian-11.tar.gz
+RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
+    if [ ! -f yq-4.27.3-0-linux-amd64-debian-11.tar.gz ]; then \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/yq-4.27.3-0-linux-amd64-debian-11.tar.gz -O ; \
+    fi && \
+    echo "1aa32d853f4ba273642dc4bb9fb50146434f2c44978d02e1728f72a047e50567  yq-4.27.3-0-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
+    tar -zxf yq-4.27.3-0-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
+    rm -rf yq-4.27.3-0-linux-amd64-debian-11.tar.gz
+RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
+    if [ ! -f spring-cloud-dataflow-2.9.5-0-linux-amd64-debian-11.tar.gz ]; then \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/spring-cloud-dataflow-2.9.5-0-linux-amd64-debian-11.tar.gz -O ; \
+    fi && \
+    echo "c869b01ae18525a2729324cdc84b045539a08bbabd453d56aab58c2dbc3cd8ba  spring-cloud-dataflow-2.9.5-0-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
+    tar -zxf spring-cloud-dataflow-2.9.5-0-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
+    rm -rf spring-cloud-dataflow-2.9.5-0-linux-amd64-debian-11.tar.gz
+RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
+    if [ ! -f gosu-1.14.0-154-linux-amd64-debian-11.tar.gz ]; then \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/gosu-1.14.0-154-linux-amd64-debian-11.tar.gz -O ; \
+    fi && \
+    echo "e36c3d90f4fbfbe989f40947fa7c8ab817f12fcf97d3aef893c753a20ce976ab  gosu-1.14.0-154-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
+    tar -zxf gosu-1.14.0-154-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
+    rm -rf gosu-1.14.0-154-linux-amd64-debian-11.tar.gz
 RUN apt-get update && apt-get upgrade -y && \
     rm -r /var/lib/apt/lists /var/cache/apt/archives
 RUN chmod g+rwX /opt/bitnami
@@ -28,7 +52,7 @@ RUN chmod g+rwX /opt/bitnami
 COPY rootfs /
 RUN /opt/bitnami/scripts/spring-cloud-dataflow/postunpack.sh
 RUN /opt/bitnami/scripts/java/postunpack.sh
-ENV APP_VERSION="2.9.4" \
+ENV APP_VERSION="2.9.5" \
     BITNAMI_APP_NAME="spring-cloud-dataflow" \
     JAVA_HOME="/opt/bitnami/java" \
     PATH="/opt/bitnami/java/bin:/opt/bitnami/common/bin:$PATH"
diff --git a/bitnami/spring-cloud-dataflow/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/spring-cloud-dataflow/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 90143ed1b61b..9f276f69c7f3 100644
--- a/bitnami/spring-cloud-dataflow/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/spring-cloud-dataflow/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -15,10 +15,10 @@
     },
     "spring-cloud-dataflow": {
         "arch": "amd64",
-        "digest": "741c9a1b6b64482b07e10bba5e9df965c7a03c944772000636eee25f11bb1112",
+        "digest": "c869b01ae18525a2729324cdc84b045539a08bbabd453d56aab58c2dbc3cd8ba",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "2.9.4-153"
+        "version": "2.9.5-0"
     },
     "yq": {
         "arch": "amd64",
diff --git a/bitnami/spring-cloud-dataflow/2/debian-11/prebuildfs/opt/bitnami/scripts/libcomponent.sh b/bitnami/spring-cloud-dataflow/2/debian-11/prebuildfs/opt/bitnami/scripts/libcomponent.sh
deleted file mode 100644
index a7b60696daa6..000000000000
--- a/bitnami/spring-cloud-dataflow/2/debian-11/prebuildfs/opt/bitnami/scripts/libcomponent.sh
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/bash
-#
-# Library for managing Bitnami components
-
-# Constants
-CACHE_ROOT="/tmp/bitnami/pkg/cache"
-DOWNLOAD_URL="https://downloads.bitnami.com/files/stacksmith"
-
-# Functions
-
-########################
-# Download and unpack a Bitnami package
-# Globals:
-#   OS_NAME
-#   OS_ARCH
-#   OS_FLAVOUR
-# Arguments:
-#   $1 - component's name
-#   $2 - component's version
-# Returns:
-#   None
-#########################
-component_unpack() {
-    local name="${1:?name is required}"
-    local version="${2:?version is required}"
-    local base_name="${name}-${version}-${OS_NAME}-${OS_ARCH}-${OS_FLAVOUR}"
-    local package_sha256=""
-    local directory="/opt/bitnami"
-
-    # Validate arguments
-    shift 2
-    while [ "$#" -gt 0 ]; do
-        case "$1" in
-            -c|--checksum)
-                shift
-                package_sha256="${1:?missing package checksum}"
-                ;;
-            *)
-                echo "Invalid command line flag $1" >&2
-                return 1
-                ;;
-        esac
-        shift
-    done
-
-    echo "Downloading $base_name package"
-    if [ -f "${CACHE_ROOT}/${base_name}.tar.gz" ]; then
-        echo "${CACHE_ROOT}/${base_name}.tar.gz already exists, skipping download."
-        cp "${CACHE_ROOT}/${base_name}.tar.gz" .
-        rm "${CACHE_ROOT}/${base_name}.tar.gz"
-        if [ -f "${CACHE_ROOT}/${base_name}.tar.gz.sha256" ]; then
-            echo "Using the local sha256 from ${CACHE_ROOT}/${base_name}.tar.gz.sha256"
-            package_sha256="$(< "${CACHE_ROOT}/${base_name}.tar.gz.sha256")"
-            rm "${CACHE_ROOT}/${base_name}.tar.gz.sha256"
-        fi
-    else
-	curl --remote-name --silent --show-error --fail "${DOWNLOAD_URL}/${base_name}.tar.gz"
-    fi
-    if [ -n "$package_sha256" ]; then
-        echo "Verifying package integrity"
-        echo "$package_sha256  ${base_name}.tar.gz" | sha256sum --check - || return "$?"
-    fi
-    tar --directory "${directory}" --extract --gunzip --file "${base_name}.tar.gz" --no-same-owner --strip-components=2 || return "$?"
-    rm "${base_name}.tar.gz"
-}
diff --git a/bitnami/spring-cloud-dataflow/2/debian-11/rootfs/opt/bitnami/scripts/spring-cloud-dataflow-env.sh b/bitnami/spring-cloud-dataflow/2/debian-11/rootfs/opt/bitnami/scripts/spring-cloud-dataflow-env.sh
index cccb6311a6f1..2c88916c73f9 100644
--- a/bitnami/spring-cloud-dataflow/2/debian-11/rootfs/opt/bitnami/scripts/spring-cloud-dataflow-env.sh
+++ b/bitnami/spring-cloud-dataflow/2/debian-11/rootfs/opt/bitnami/scripts/spring-cloud-dataflow-env.sh
@@ -31,6 +31,7 @@ spring_cloud_dataflow_env_vars=(
     SPRING_CLOUD_DATAFLOW_FEATURES_TASKS_ENABLED
     SPRING_CLOUD_DATAFLOW_FEATURES_SCHEDULES_ENABLED
     SPRING_CLOUD_SKIPPER_CLIENT_SERVER_URI
+    SPRING_CLOUD_DATAFLOW_TASK_COMPOSEDTASKRUNNER_URI
     JAVA_OPTS
 )
 for env_var in "${spring_cloud_dataflow_env_vars[@]}"; do
@@ -68,6 +69,9 @@ export SPRING_CLOUD_DATAFLOW_FEATURES_TASKS_ENABLED="${SPRING_CLOUD_DATAFLOW_FEA
 export SPRING_CLOUD_DATAFLOW_FEATURES_SCHEDULES_ENABLED="${SPRING_CLOUD_DATAFLOW_FEATURES_SCHEDULES_ENABLED:-false}"
 export SPRING_CLOUD_SKIPPER_CLIENT_SERVER_URI="${SPRING_CLOUD_SKIPPER_CLIENT_SERVER_URI:-}"
 
+# Workaround for https://github.com/spring-cloud/spring-cloud-dataflow/issues/5072
+export SPRING_CLOUD_DATAFLOW_TASK_COMPOSEDTASKRUNNER_URI="${SPRING_CLOUD_DATAFLOW_TASK_COMPOSEDTASKRUNNER_URI:-maven://org.springframework.cloud:spring-cloud-dataflow-composed-task-runner:${APP_VERSION:-}}"
+
 # Java settings
 export JAVA_OPTS="${JAVA_OPTS:-}"
 
diff --git a/bitnami/spring-cloud-dataflow/2/debian-11/tags-info.yaml b/bitnami/spring-cloud-dataflow/2/debian-11/tags-info.yaml
index 66c0c9f6015e..2baf01696238 100644
--- a/bitnami/spring-cloud-dataflow/2/debian-11/tags-info.yaml
+++ b/bitnami/spring-cloud-dataflow/2/debian-11/tags-info.yaml
@@ -1,5 +1,5 @@
 rolling-tags:
   - "2"
   - "2-debian-11"
-  - "2.9.4"
+  - "2.9.5"
   - "latest"
diff --git a/bitnami/spring-cloud-dataflow/README.md b/bitnami/spring-cloud-dataflow/README.md
index 541da302b6f6..24c9f4d6b914 100644
--- a/bitnami/spring-cloud-dataflow/README.md
+++ b/bitnami/spring-cloud-dataflow/README.md
@@ -39,7 +39,7 @@ Non-root container images add an extra layer of security and are generally recom
 Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/).
 
 
-* [`2`, `2-debian-11`, `2.9.4`, `2.9.4-debian-11-r32`, `latest` (2/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/spring-cloud-dataflow/2/debian-11/Dockerfile)
+* [`2`, `2-debian-11`, `2.9.5`, `2.9.5-debian-11-r0`, `latest` (2/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/spring-cloud-dataflow/2/debian-11/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).