diff --git a/bitnami/postgresql/18/debian-12/Dockerfile b/bitnami/postgresql/18/debian-12/Dockerfile
index 858ca3c56331..82ddec1a696c 100644
--- a/bitnami/postgresql/18/debian-12/Dockerfile
+++ b/bitnami/postgresql/18/debian-12/Dockerfile
@@ -9,7 +9,7 @@ ARG TARGETARCH
 ARG WITH_ALL_LOCALES="no"
 
 LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
-      org.opencontainers.image.created="2026-06-05T18:29:40Z" \
+      org.opencontainers.image.created="2026-06-08T10:57:39Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/postgresql/README.md" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/postgresql" \
@@ -31,7 +31,7 @@ RUN --mount=type=secret,id=downloads_url,env=SECRET_DOWNLOADS_URL \
     mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \
     COMPONENTS=( \
       "nss-wrapper-1.1.16-0-linux-${OS_ARCH}-debian-12" \
-      "postgresql-18.4.0-1-linux-${OS_ARCH}-debian-12" \
+      "postgresql-18.4.0-2-linux-${OS_ARCH}-debian-12" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
@@ -56,7 +56,7 @@ COPY rootfs /
 RUN /opt/bitnami/scripts/postgresql/postunpack.sh
 ENV APP_VERSION="18.4.0" \
     BITNAMI_APP_NAME="postgresql" \
-    IMAGE_REVISION="5" \
+    IMAGE_REVISION="6" \
     LANG="en_US.UTF-8" \
     LANGUAGE="en_US:en" \
     NSS_WRAPPER_LIB="/opt/bitnami/common/lib/libnss_wrapper.so" \
diff --git a/bitnami/postgresql/18/debian-12/prebuildfs/opt/bitnami/checksums/postgresql-18.4.0-1-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/postgresql/18/debian-12/prebuildfs/opt/bitnami/checksums/postgresql-18.4.0-1-linux-amd64-debian-12.tar.gz.sha256
deleted file mode 100644
index 1c8955c79d9b..000000000000
--- a/bitnami/postgresql/18/debian-12/prebuildfs/opt/bitnami/checksums/postgresql-18.4.0-1-linux-amd64-debian-12.tar.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-f899c1ed519370b9a04a32f672c5bcca52e180a4ade2fd787d248b122e50b028  postgresql-18.4.0-1-linux-amd64-debian-12.tar.gz
diff --git a/bitnami/postgresql/18/debian-12/prebuildfs/opt/bitnami/checksums/postgresql-18.4.0-1-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/postgresql/18/debian-12/prebuildfs/opt/bitnami/checksums/postgresql-18.4.0-1-linux-arm64-debian-12.tar.gz.sha256
deleted file mode 100644
index 194f1727d14c..000000000000
--- a/bitnami/postgresql/18/debian-12/prebuildfs/opt/bitnami/checksums/postgresql-18.4.0-1-linux-arm64-debian-12.tar.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-4dce3513036f5aece69713f08c71ae3e27af7ebb34aa4dce39fa8a62f1a9153e  postgresql-18.4.0-1-linux-arm64-debian-12.tar.gz
diff --git a/bitnami/postgresql/18/debian-12/prebuildfs/opt/bitnami/checksums/postgresql-18.4.0-2-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/postgresql/18/debian-12/prebuildfs/opt/bitnami/checksums/postgresql-18.4.0-2-linux-amd64-debian-12.tar.gz.sha256
new file mode 100644
index 000000000000..aa9ec95ffbd9
--- /dev/null
+++ b/bitnami/postgresql/18/debian-12/prebuildfs/opt/bitnami/checksums/postgresql-18.4.0-2-linux-amd64-debian-12.tar.gz.sha256
@@ -0,0 +1 @@
+64d907473a62c2820945744d3ebbe863428dd0e9b7090f0cc9ee929b8e2c0985  postgresql-18.4.0-2-linux-amd64-debian-12.tar.gz
diff --git a/bitnami/postgresql/18/debian-12/prebuildfs/opt/bitnami/checksums/postgresql-18.4.0-2-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/postgresql/18/debian-12/prebuildfs/opt/bitnami/checksums/postgresql-18.4.0-2-linux-arm64-debian-12.tar.gz.sha256
new file mode 100644
index 000000000000..88dce2cf677e
--- /dev/null
+++ b/bitnami/postgresql/18/debian-12/prebuildfs/opt/bitnami/checksums/postgresql-18.4.0-2-linux-arm64-debian-12.tar.gz.sha256
@@ -0,0 +1 @@
+dc77fdb32a2556adf2716b83abb1df2c17b03e7ded754673ab69f45d54c8ccef  postgresql-18.4.0-2-linux-arm64-debian-12.tar.gz