diff --git a/bitnami/spring-cloud-dataflow-composed-task-runner/2/debian-11/Dockerfile b/bitnami/spring-cloud-dataflow-composed-task-runner/2/debian-11/Dockerfile
index 21821ab3ee80..151f511c9b2e 100644
--- a/bitnami/spring-cloud-dataflow-composed-task-runner/2/debian-11/Dockerfile
+++ b/bitnami/spring-cloud-dataflow-composed-task-runner/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="2.9.6-debian-11-r6" \
+      org.opencontainers.image.ref.name="2.9.6-debian-11-r7" \
       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="VMware, Inc." \
@@ -21,30 +21,21 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 # Install required system packages and dependencies
 RUN install_packages ca-certificates curl libc6 libgcc-s1 procps
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
-    if [ ! -f java-1.8.345-2-linux-${OS_ARCH}-debian-11.tar.gz ]; then \
-      curl -SsLf https://downloads.bitnami.com/files/stacksmith/java-1.8.345-2-linux-${OS_ARCH}-debian-11.tar.gz -O ; \
-      curl -SsLf https://downloads.bitnami.com/files/stacksmith/java-1.8.345-2-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \
-    fi && \
-    sha256sum -c java-1.8.345-2-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \
-    tar -zxf java-1.8.345-2-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
-    rm -rf java-1.8.345-2-linux-${OS_ARCH}-debian-11.tar.gz java-1.8.345-2-linux-${OS_ARCH}-debian-11.tar.gz.sha256
-RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
-    if [ ! -f spring-cloud-dataflow-composed-task-runner-2.9.6-0-linux-${OS_ARCH}-debian-11.tar.gz ]; then \
-      curl -SsLf https://downloads.bitnami.com/files/stacksmith/spring-cloud-dataflow-composed-task-runner-2.9.6-0-linux-${OS_ARCH}-debian-11.tar.gz -O ; \
-      curl -SsLf https://downloads.bitnami.com/files/stacksmith/spring-cloud-dataflow-composed-task-runner-2.9.6-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \
-    fi && \
-    sha256sum -c spring-cloud-dataflow-composed-task-runner-2.9.6-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \
-    tar -zxf spring-cloud-dataflow-composed-task-runner-2.9.6-0-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
-    rm -rf spring-cloud-dataflow-composed-task-runner-2.9.6-0-linux-${OS_ARCH}-debian-11.tar.gz spring-cloud-dataflow-composed-task-runner-2.9.6-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256
-RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
-    if [ ! -f gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz ]; then \
-      curl -SsLf https://downloads.bitnami.com/files/stacksmith/gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz -O ; \
-      curl -SsLf https://downloads.bitnami.com/files/stacksmith/gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \
-    fi && \
-    sha256sum -c gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \
-    tar -zxf gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
-    rm -rf gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz.sha256
-RUN apt-get update && apt-get upgrade -y && \
+    for COMPONENT in \
+      "java-1.8.345-2-linux-${OS_ARCH}-debian-11" \
+      "spring-cloud-dataflow-composed-task-runner-2.9.6-0-linux-${OS_ARCH}-debian-11" \
+      "gosu-1.14.0-154-linux-${OS_ARCH}-debian-11" ; \
+    do \
+      if [ ! -f "${COMPONENT}.tar.gz" ]; then \
+        curl -SsLf https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz -O ; \
+        curl -SsLf https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256 -O ; \
+      fi && \
+      sha256sum -c "${COMPONENT}.tar.gz.sha256" && \
+      tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
+      rm -rf "${COMPONENT}.tar.gz{,sha256}" ; \
+    done
+RUN apt-get autoremove --purge -y curl && \
+    apt-get update && apt-get upgrade -y && \
     apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives
 RUN chmod g+rwX /opt/bitnami
 RUN mkdir /.m2 && chmod -R g+rwX /.m2
diff --git a/bitnami/spring-cloud-dataflow-composed-task-runner/README.md b/bitnami/spring-cloud-dataflow-composed-task-runner/README.md
index 065ca7a636a8..e7afe17c60e6 100644
--- a/bitnami/spring-cloud-dataflow-composed-task-runner/README.md
+++ b/bitnami/spring-cloud-dataflow-composed-task-runner/README.md
@@ -28,7 +28,7 @@ $ docker run --name spring-cloud-dataflow-composed-task-runner bitnami/spring-cl
 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.6`, `2.9.6-debian-11-r6`, `latest` (2/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/spring-cloud-dataflow-composed-task-runner/2/debian-11/Dockerfile)
+* [`2`, `2-debian-11`, `2.9.6`, `2.9.6-debian-11-r7`, `latest` (2/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/spring-cloud-dataflow-composed-task-runner/2/debian-11/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).