diff --git a/bitnami/concourse/7/debian-11/Dockerfile b/bitnami/concourse/7/debian-11/Dockerfile
index 7408b74591af..0c429b00cb7e 100644
--- a/bitnami/concourse/7/debian-11/Dockerfile
+++ b/bitnami/concourse/7/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="7.8.2-debian-11-r20" \
+      org.opencontainers.image.ref.name="7.8.2-debian-11-r21" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/concourse" \
       org.opencontainers.image.title="concourse" \
       org.opencontainers.image.vendor="VMware, Inc." \
@@ -27,7 +27,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     tar -zxf concourse-7.8.2-2-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
     rm -rf concourse-7.8.2-2-linux-${OS_ARCH}-debian-11.tar.gz concourse-7.8.2-2-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 touch /.flyrc && chmod g+rwX /.flyrc
 RUN update-alternatives --set iptables /usr/sbin/iptables-legacy && \
     update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy
diff --git a/bitnami/concourse/7/debian-11/prebuildfs/usr/sbin/install_packages b/bitnami/concourse/7/debian-11/prebuildfs/usr/sbin/install_packages
index c9577647443b..77857a1a57f2 100755
--- a/bitnami/concourse/7/debian-11/prebuildfs/usr/sbin/install_packages
+++ b/bitnami/concourse/7/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/concourse/README.md b/bitnami/concourse/README.md
index 70a43cc96efa..08e4cae28cda 100644
--- a/bitnami/concourse/README.md
+++ b/bitnami/concourse/README.md
@@ -41,7 +41,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/containers/how-to/understand-rolling-tags-containers/).
 
 
-* [`7`, `7-debian-11`, `7.8.2`, `7.8.2-debian-11-r20`, `latest` (7/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/concourse/7/debian-11/Dockerfile)
+* [`7`, `7-debian-11`, `7.8.2`, `7.8.2-debian-11-r21`, `latest` (7/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/concourse/7/debian-11/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).