diff --git a/bitnami/percona-mysql/8.0/debian-11/Dockerfile b/bitnami/percona-mysql/8.0/debian-11/Dockerfile
index 6e19537135da..418df44dfe18 100644
--- a/bitnami/percona-mysql/8.0/debian-11/Dockerfile
+++ b/bitnami/percona-mysql/8.0/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="8.0.29-21-debian-11-r17" \
+      org.opencontainers.image.ref.name="8.0.29-21-debian-11-r18" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/percona-mysql" \
       org.opencontainers.image.title="percona-mysql" \
       org.opencontainers.image.vendor="VMware, Inc." \
@@ -20,46 +20,23 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 # Install required system packages and dependencies
 RUN install_packages ca-certificates curl libaio1 libaudit1 libbrotli1 libbz2-1.0 libc6 libcap-ng0 libcom-err2 libcrypt1 libcurl4 libev4 libffi7 libgcc-s1 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed6 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 libnettle8 libnghttp2-14 libnuma-dev libp11-kit0 libpam0g libpsl5 librtmp1 libsasl2-2 libssh2-1 libssl1.1 libstdc++6 libtasn1-6 libudev1 libunistring2 libuuid1 procps zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
-    if [ ! -f percona-xtrabackup-binary-8.0.29-22-1-linux-${OS_ARCH}-debian-11.tar.gz ]; then \
-      curl -SsLf https://downloads.bitnami.com/files/stacksmith/percona-xtrabackup-binary-8.0.29-22-1-linux-${OS_ARCH}-debian-11.tar.gz -O ; \
-      curl -SsLf https://downloads.bitnami.com/files/stacksmith/percona-xtrabackup-binary-8.0.29-22-1-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \
-    fi && \
-    sha256sum -c percona-xtrabackup-binary-8.0.29-22-1-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \
-    tar -zxf percona-xtrabackup-binary-8.0.29-22-1-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
-    rm -rf percona-xtrabackup-binary-8.0.29-22-1-linux-${OS_ARCH}-debian-11.tar.gz percona-xtrabackup-binary-8.0.29-22-1-linux-${OS_ARCH}-debian-11.tar.gz.sha256
-RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
-    if [ ! -f ini-file-1.4.3-153-linux-${OS_ARCH}-debian-11.tar.gz ]; then \
-      curl -SsLf https://downloads.bitnami.com/files/stacksmith/ini-file-1.4.3-153-linux-${OS_ARCH}-debian-11.tar.gz -O ; \
-      curl -SsLf https://downloads.bitnami.com/files/stacksmith/ini-file-1.4.3-153-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \
-    fi && \
-    sha256sum -c ini-file-1.4.3-153-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \
-    tar -zxf ini-file-1.4.3-153-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
-    rm -rf ini-file-1.4.3-153-linux-${OS_ARCH}-debian-11.tar.gz ini-file-1.4.3-153-linux-${OS_ARCH}-debian-11.tar.gz.sha256
-RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
-    if [ ! -f percona-mysql-8.0.29-21-1-linux-${OS_ARCH}-debian-11.tar.gz ]; then \
-      curl -SsLf https://downloads.bitnami.com/files/stacksmith/percona-mysql-8.0.29-21-1-linux-${OS_ARCH}-debian-11.tar.gz -O ; \
-      curl -SsLf https://downloads.bitnami.com/files/stacksmith/percona-mysql-8.0.29-21-1-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \
-    fi && \
-    sha256sum -c percona-mysql-8.0.29-21-1-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \
-    tar -zxf percona-mysql-8.0.29-21-1-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
-    rm -rf percona-mysql-8.0.29-21-1-linux-${OS_ARCH}-debian-11.tar.gz percona-mysql-8.0.29-21-1-linux-${OS_ARCH}-debian-11.tar.gz.sha256
-RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
-    if [ ! -f mysql-shell-8.0.30-1-linux-${OS_ARCH}-debian-11.tar.gz ]; then \
-      curl -SsLf https://downloads.bitnami.com/files/stacksmith/mysql-shell-8.0.30-1-linux-${OS_ARCH}-debian-11.tar.gz -O ; \
-      curl -SsLf https://downloads.bitnami.com/files/stacksmith/mysql-shell-8.0.30-1-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \
-    fi && \
-    sha256sum -c mysql-shell-8.0.30-1-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \
-    tar -zxf mysql-shell-8.0.30-1-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
-    rm -rf mysql-shell-8.0.30-1-linux-${OS_ARCH}-debian-11.tar.gz mysql-shell-8.0.30-1-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 \
+      "percona-xtrabackup-binary-8.0.29-22-1-linux-${OS_ARCH}-debian-11" \
+      "ini-file-1.4.3-153-linux-${OS_ARCH}-debian-11" \
+      "percona-mysql-8.0.29-21-1-linux-${OS_ARCH}-debian-11" \
+      "mysql-shell-8.0.30-1-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 /docker-entrypoint-initdb.d
diff --git a/bitnami/percona-mysql/README.md b/bitnami/percona-mysql/README.md
index 30f7d878bfac..6a274c396209 100644
--- a/bitnami/percona-mysql/README.md
+++ b/bitnami/percona-mysql/README.md
@@ -28,7 +28,7 @@ $ docker run --name percona-mysql bitnami/percona-mysql:latest
 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/).
 
 
-* [`8.0`, `8.0-debian-11`, `8.0.29-21`, `8.0.29-21-debian-11-r17`, `latest` (8.0/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/percona-mysql/8.0/debian-11/Dockerfile)
+* [`8.0`, `8.0-debian-11`, `8.0.29-21`, `8.0.29-21-debian-11-r18`, `latest` (8.0/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/percona-mysql/8.0/debian-11/Dockerfile)
 * [`5.7`, `5.7-debian-11`, `5.7.39-42`, `5.7.39-42-debian-11-r15` (5.7/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/percona-mysql/5.7/debian-11/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).