diff --git a/bitnami/envoy/1.22/debian-11/Dockerfile b/bitnami/envoy/1.22/debian-11/Dockerfile
index c99e5bb70491..deb652df1935 100644
--- a/bitnami/envoy/1.22/debian-11/Dockerfile
+++ b/bitnami/envoy/1.22/debian-11/Dockerfile
@@ -6,7 +6,7 @@ ENV HOME="/" \
 
 LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
       org.opencontainers.image.description="Application packaged by Bitnami" \
-      org.opencontainers.image.ref.name="1.22.5-debian-11-r3" \
+      org.opencontainers.image.ref.name="1.22.5-debian-11-r4" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/envoy" \
       org.opencontainers.image.title="envoy" \
       org.opencontainers.image.vendor="VMware, Inc." \
@@ -15,11 +15,12 @@ LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
 COPY prebuildfs /
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 # Install required system packages and dependencies
-RUN install_packages ca-certificates curl gzip libc6 procps tar wget
-RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/envoy-1.22.5-0-linux-amd64-debian-11.tar.gz && \
-    echo "fa9ada6acb45636407c999ffcaf00c629d94a22754906f4cbcf6c85dfee0a7a1  /tmp/bitnami/pkg/cache/envoy-1.22.5-0-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
-    tar -zxf /tmp/bitnami/pkg/cache/envoy-1.22.5-0-linux-amd64-debian-11.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \
-    rm -rf /tmp/bitnami/pkg/cache/envoy-1.22.5-0-linux-amd64-debian-11.tar.gz
+RUN install_packages ca-certificates curl gzip libc6 procps tar
+RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
+    curl -SsLf https://downloads.bitnami.com/files/stacksmith/envoy-1.22.5-0-linux-amd64-debian-11.tar.gz -o envoy-1.22.5-0-linux-amd64-debian-11.tar.gz && \
+    echo "fa9ada6acb45636407c999ffcaf00c629d94a22754906f4cbcf6c85dfee0a7a1  envoy-1.22.5-0-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
+    tar -zxf envoy-1.22.5-0-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --wildcards '*/files' && \
+    rm -rf envoy-1.22.5-0-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
diff --git a/bitnami/envoy/README.md b/bitnami/envoy/README.md
index bd4d8816498c..06d4325dddf7 100644
--- a/bitnami/envoy/README.md
+++ b/bitnami/envoy/README.md
@@ -29,7 +29,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 
 
 * [`1.23`, `1.23-debian-11`, `1.23.0`, `1.23.0-debian-11-r13`, `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-r3` (1.22/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/envoy/1.22/debian-11/Dockerfile)
+* [`1.22`, `1.22-debian-11`, `1.22.5`, `1.22.5-debian-11-r4` (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-r10` (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-r11` (1.20/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/envoy/1.20/debian-11/Dockerfile)
 * [`1.19`, `1.19-debian-11`, `1.19.5`, `1.19.5-debian-11-r25` (1.19/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/envoy/1.19/debian-11/Dockerfile)