diff --git a/bitnami/envoy/1.21/debian-11/Dockerfile b/bitnami/envoy/1.21/debian-11/Dockerfile
index 15713877e726..d8659d343ea5 100644
--- a/bitnami/envoy/1.21/debian-11/Dockerfile
+++ b/bitnami/envoy/1.21/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="1.21.5-debian-11-r19" \
+      org.opencontainers.image.ref.name="1.21.5-debian-11-r20" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/envoy" \
       org.opencontainers.image.title="envoy" \
       org.opencontainers.image.vendor="VMware, Inc." \
@@ -18,7 +18,7 @@ ENV HOME="/" \
 COPY prebuildfs /
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 # Install required system packages and dependencies
-RUN install_packages ca-certificates curl gzip libc6 procps tar
+RUN install_packages ca-certificates curl libc6 procps
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     if [ ! -f envoy-1.21.5-2-linux-${OS_ARCH}-debian-11.tar.gz ]; then \
       curl -SsLf https://downloads.bitnami.com/files/stacksmith/envoy-1.21.5-2-linux-${OS_ARCH}-debian-11.tar.gz -O ; \
diff --git a/bitnami/envoy/1.21/debian-11/prebuildfs/usr/sbin/install_packages b/bitnami/envoy/1.21/debian-11/prebuildfs/usr/sbin/install_packages
index 2c915f265c9d..77857a1a57f2 100755
--- a/bitnami/envoy/1.21/debian-11/prebuildfs/usr/sbin/install_packages
+++ b/bitnami/envoy/1.21/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
     (
diff --git a/bitnami/envoy/README.md b/bitnami/envoy/README.md
index 02ff9c7ee742..d17138c00e6d 100644
--- a/bitnami/envoy/README.md
+++ b/bitnami/envoy/README.md
@@ -30,7 +30,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 
 * [`1.23`, `1.23-debian-11`, `1.23.1`, `1.23.1-debian-11-r9`, `latest` (1.23/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/envoy/1.23/debian-11/Dockerfile)
 * [`1.22`, `1.22-debian-11`, `1.22.5`, `1.22.5-debian-11-r13` (1.22/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/envoy/1.22/debian-11/Dockerfile)
-* [`1.21`, `1.21-debian-11`, `1.21.5`, `1.21.5-debian-11-r19` (1.21/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/envoy/1.21/debian-11/Dockerfile)
+* [`1.21`, `1.21-debian-11`, `1.21.5`, `1.21.5-debian-11-r20` (1.21/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/envoy/1.21/debian-11/Dockerfile)
 * [`1.20`, `1.20-debian-11`, `1.20.7`, `1.20.7-debian-11-r19` (1.20/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/envoy/1.20/debian-11/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).