diff --git a/bitnami/spring-cloud-dataflow-shell/2/debian-11/Dockerfile b/bitnami/spring-cloud-dataflow-shell/2/debian-11/Dockerfile
index 95c2d03a4b11..e366ddcfc427 100644
--- a/bitnami/spring-cloud-dataflow-shell/2/debian-11/Dockerfile
+++ b/bitnami/spring-cloud-dataflow-shell/2/debian-11/Dockerfile
@@ -4,7 +4,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-r1" \
+      org.opencontainers.image.ref.name="2.9.6-debian-11-r2" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/spring-cloud-dataflow-shell" \
       org.opencontainers.image.title="spring-cloud-dataflow-shell" \
       org.opencontainers.image.vendor="VMware, Inc." \
@@ -36,7 +36,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     tar -zxf spring-cloud-dataflow-shell-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-shell-2.9.6-0-linux-${OS_ARCH}-debian-11.tar.gz spring-cloud-dataflow-shell-2.9.6-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256
 RUN apt-get update && apt-get upgrade -y && \
-    rm -r /var/lib/apt/lists /var/cache/apt/archives
+    apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives
 RUN chmod g+rwX /opt/bitnami
 RUN localedef -c -f UTF-8 -i en_US en_US.UTF-8
 RUN update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX && \
diff --git a/bitnami/spring-cloud-dataflow-shell/2/debian-11/prebuildfs/usr/sbin/install_packages b/bitnami/spring-cloud-dataflow-shell/2/debian-11/prebuildfs/usr/sbin/install_packages
index c9577647443b..77857a1a57f2 100755
--- a/bitnami/spring-cloud-dataflow-shell/2/debian-11/prebuildfs/usr/sbin/install_packages
+++ b/bitnami/spring-cloud-dataflow-shell/2/debian-11/prebuildfs/usr/sbin/install_packages
@@ -1,9 +1,10 @@
 #!/bin/sh
-set -e
-set -u
-export DEBIAN_FRONTEND=noninteractive
+set -eu
+
 n=0
 max=2
+export DEBIAN_FRONTEND=noninteractive
+
 until [ $n -gt $max ]; do
     set +e
     (
@@ -21,4 +22,4 @@ until [ $n -gt $max ]; do
     echo "apt failed, retrying"
     n=$(($n + 1))
 done
-rm -r /var/lib/apt/lists /var/cache/apt/archives
+apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives
diff --git a/bitnami/spring-cloud-dataflow-shell/README.md b/bitnami/spring-cloud-dataflow-shell/README.md
index 39065db836db..e221d5735892 100644
--- a/bitnami/spring-cloud-dataflow-shell/README.md
+++ b/bitnami/spring-cloud-dataflow-shell/README.md
@@ -28,7 +28,7 @@ $ docker run --name spring-cloud-dataflow-shell bitnami/spring-cloud-dataflow-sh
 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-r1`, `latest` (2/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/spring-cloud-dataflow-shell/2/debian-11/Dockerfile)
+* [`2`, `2-debian-11`, `2.9.6`, `2.9.6-debian-11-r2`, `latest` (2/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/spring-cloud-dataflow-shell/2/debian-11/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).