diff --git a/bitnami/postgresql/18/debian-12/Dockerfile b/bitnami/postgresql/18/debian-12/Dockerfile
index 5182725c5ee2..3781501b8ddc 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-11T01:50:51Z" \
+      org.opencontainers.image.created="2026-06-18T08:22:08Z" \
       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-3-linux-${OS_ARCH}-debian-12" \
+      "postgresql-18.4.0-4-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="8" \
+    IMAGE_REVISION="9" \
     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-3-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/postgresql/18/debian-12/prebuildfs/opt/bitnami/checksums/postgresql-18.4.0-3-linux-amd64-debian-12.tar.gz.sha256
deleted file mode 100644
index 6cc0ebf9a75e..000000000000
--- a/bitnami/postgresql/18/debian-12/prebuildfs/opt/bitnami/checksums/postgresql-18.4.0-3-linux-amd64-debian-12.tar.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-29cef5ec215d1625b47384e11b33d0b1be4ae3d3480c82441a9f923549f9806d  postgresql-18.4.0-3-linux-amd64-debian-12.tar.gz
diff --git a/bitnami/postgresql/18/debian-12/prebuildfs/opt/bitnami/checksums/postgresql-18.4.0-3-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/postgresql/18/debian-12/prebuildfs/opt/bitnami/checksums/postgresql-18.4.0-3-linux-arm64-debian-12.tar.gz.sha256
deleted file mode 100644
index 76d6dfaa0020..000000000000
--- a/bitnami/postgresql/18/debian-12/prebuildfs/opt/bitnami/checksums/postgresql-18.4.0-3-linux-arm64-debian-12.tar.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-f8e4b0cd2690acdbc574df0bab08d3e41547d0aa51a7401ca5296bdac83efffc  postgresql-18.4.0-3-linux-arm64-debian-12.tar.gz
diff --git a/bitnami/postgresql/18/debian-12/prebuildfs/opt/bitnami/checksums/postgresql-18.4.0-4-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/postgresql/18/debian-12/prebuildfs/opt/bitnami/checksums/postgresql-18.4.0-4-linux-amd64-debian-12.tar.gz.sha256
new file mode 100644
index 000000000000..66c024d94321
--- /dev/null
+++ b/bitnami/postgresql/18/debian-12/prebuildfs/opt/bitnami/checksums/postgresql-18.4.0-4-linux-amd64-debian-12.tar.gz.sha256
@@ -0,0 +1 @@
+b685a76bde7083b9397953b4b2f26ce3381b870d96756fa61b7cd07d3343423e  postgresql-18.4.0-4-linux-amd64-debian-12.tar.gz
diff --git a/bitnami/postgresql/18/debian-12/prebuildfs/opt/bitnami/checksums/postgresql-18.4.0-4-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/postgresql/18/debian-12/prebuildfs/opt/bitnami/checksums/postgresql-18.4.0-4-linux-arm64-debian-12.tar.gz.sha256
new file mode 100644
index 000000000000..7b31a7c2a232
--- /dev/null
+++ b/bitnami/postgresql/18/debian-12/prebuildfs/opt/bitnami/checksums/postgresql-18.4.0-4-linux-arm64-debian-12.tar.gz.sha256
@@ -0,0 +1 @@
+1f91e8b32c11031b1139a8a0aeebd2f9106655d052964ce58fe9f22f729ca6c6  postgresql-18.4.0-4-linux-arm64-debian-12.tar.gz
diff --git a/bitnami/postgresql/18/debian-12/prebuildfs/opt/bitnami/scripts/libpersistence.sh b/bitnami/postgresql/18/debian-12/prebuildfs/opt/bitnami/scripts/libpersistence.sh
index 18445e7d27fa..833ee5ab1d65 100644
--- a/bitnami/postgresql/18/debian-12/prebuildfs/opt/bitnami/scripts/libpersistence.sh
+++ b/bitnami/postgresql/18/debian-12/prebuildfs/opt/bitnami/scripts/libpersistence.sh
@@ -39,7 +39,7 @@ persist_app() {
     fi
     pushd "$install_dir" >/dev/null || exit
     local file_to_persist_relative file_to_persist_destination file_to_persist_destination_folder
-    local -r tmp_file="/tmp/perms.acl"
+    local -r acl_file="$(mktemp "${TMPDIR:-/tmp}"/acl.XXXXXXXXXX)"
     for file_to_persist in "${files_to_persist[@]}"; do
         if [[ ! -f "$file_to_persist" && ! -d "$file_to_persist" ]]; then
             error "Cannot persist '${file_to_persist}' because it does not exist"
@@ -50,22 +50,22 @@ persist_app() {
         file_to_persist_destination_folder="$(dirname "$file_to_persist_destination")"
         # Get original permissions for existing files, which will be applied later
         # Exclude the root directory with 'sed', to avoid issues when copying the entirety of it to a volume
-        getfacl -R "$file_to_persist_relative" | sed -E '/# file: (\..+|[^.])/,$!d' > "$tmp_file"
+        getfacl -R "$file_to_persist_relative" | sed -E '/# file: (\..+|[^.])/,$!d' > "$acl_file"
         # Copy directories to the volume
         ensure_dir_exists "$file_to_persist_destination_folder"
         cp -Lr --preserve=links "$file_to_persist_relative" "$file_to_persist_destination_folder"
         # Restore permissions
         pushd "$persist_dir" >/dev/null || exit
         if am_i_root; then
-            setfacl --restore="$tmp_file"
+            setfacl --restore="$acl_file"
         else
             # When running as non-root, don't change ownership
-            setfacl --restore=<(grep -E -v '^# (owner|group):' "$tmp_file")
+            setfacl --restore=<(grep -E -v '^# (owner|group):' "$acl_file")
         fi
         popd >/dev/null || exit
     done
     popd >/dev/null || exit
-    rm -f "$tmp_file"
+    rm -f "$acl_file"
     # Install the persisted files into the installation directory, via symlinks
     restore_persisted_app "$@"
 }