diff --git a/bitnami/neo4j/2026/debian-12/Dockerfile b/bitnami/neo4j/2026/debian-12/Dockerfile
index 9406e051f120..4436e97e5520 100644
--- a/bitnami/neo4j/2026/debian-12/Dockerfile
+++ b/bitnami/neo4j/2026/debian-12/Dockerfile
@@ -8,13 +8,13 @@ ARG JAVA_EXTRA_SECURITY_DIR="/bitnami/java/extra-security"
 ARG TARGETARCH
 
 LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
-      org.opencontainers.image.created="2026-07-02T10:03:49Z" \
+      org.opencontainers.image.created="2026-07-08T12:10:16Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/neo4j/README.md" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/neo4j" \
       org.opencontainers.image.title="neo4j" \
       org.opencontainers.image.vendor="Broadcom, Inc." \
-      org.opencontainers.image.version="2026.5.0"
+      org.opencontainers.image.version="2026.6.0"
 
 ENV HOME="/opt/bitnami/neo4j/.home" \
     OS_ARCH="${TARGETARCH:-amd64}" \
@@ -30,7 +30,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=( \
       "jre-21.0.11-11-1-linux-${OS_ARCH}-debian-12" \
-      "neo4j-2026.5.0-1-linux-${OS_ARCH}-debian-12" \
+      "neo4j-2026.6.0-0-linux-${OS_ARCH}-debian-12" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
@@ -50,9 +50,9 @@ RUN uninstall_packages curl
 COPY rootfs /
 RUN /opt/bitnami/scripts/java/postunpack.sh
 RUN /opt/bitnami/scripts/neo4j/postunpack.sh
-ENV APP_VERSION="2026.5.0" \
+ENV APP_VERSION="2026.6.0" \
     BITNAMI_APP_NAME="neo4j" \
-    IMAGE_REVISION="3" \
+    IMAGE_REVISION="0" \
     JAVA_HOME="/opt/bitnami/java" \
     JAVA_OPTS="-Duser.home=/opt/bitnami/neo4j/.home" \
     PATH="/opt/bitnami/java/bin:/opt/bitnami/neo4j/bin:$PATH"
diff --git a/bitnami/neo4j/2026/debian-12/prebuildfs/opt/bitnami/checksums/neo4j-2026.5.0-1-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/neo4j/2026/debian-12/prebuildfs/opt/bitnami/checksums/neo4j-2026.5.0-1-linux-amd64-debian-12.tar.gz.sha256
deleted file mode 100644
index b2783a8a7cba..000000000000
--- a/bitnami/neo4j/2026/debian-12/prebuildfs/opt/bitnami/checksums/neo4j-2026.5.0-1-linux-amd64-debian-12.tar.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-b1de3764362ab9c40a7cbfda8aae1e9681c60cf032de4cba21a13bce365ee88b  neo4j-2026.5.0-1-linux-amd64-debian-12.tar.gz
diff --git a/bitnami/neo4j/2026/debian-12/prebuildfs/opt/bitnami/checksums/neo4j-2026.5.0-1-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/neo4j/2026/debian-12/prebuildfs/opt/bitnami/checksums/neo4j-2026.5.0-1-linux-arm64-debian-12.tar.gz.sha256
deleted file mode 100644
index 518c997de4c6..000000000000
--- a/bitnami/neo4j/2026/debian-12/prebuildfs/opt/bitnami/checksums/neo4j-2026.5.0-1-linux-arm64-debian-12.tar.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-3d68a5542c74d46e8223ab952a05f723e335b9ac7f0eece1dc96980de5f8b339  neo4j-2026.5.0-1-linux-arm64-debian-12.tar.gz
diff --git a/bitnami/neo4j/2026/debian-12/prebuildfs/opt/bitnami/checksums/neo4j-2026.6.0-0-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/neo4j/2026/debian-12/prebuildfs/opt/bitnami/checksums/neo4j-2026.6.0-0-linux-amd64-debian-12.tar.gz.sha256
new file mode 100644
index 000000000000..528d62e51f6a
--- /dev/null
+++ b/bitnami/neo4j/2026/debian-12/prebuildfs/opt/bitnami/checksums/neo4j-2026.6.0-0-linux-amd64-debian-12.tar.gz.sha256
@@ -0,0 +1 @@
+12981fdd2b5453a3c09ff5edb309bf828aa952ba04b921f52834708b713f9170  neo4j-2026.6.0-0-linux-amd64-debian-12.tar.gz
diff --git a/bitnami/neo4j/2026/debian-12/prebuildfs/opt/bitnami/checksums/neo4j-2026.6.0-0-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/neo4j/2026/debian-12/prebuildfs/opt/bitnami/checksums/neo4j-2026.6.0-0-linux-arm64-debian-12.tar.gz.sha256
new file mode 100644
index 000000000000..2d78781cfc9a
--- /dev/null
+++ b/bitnami/neo4j/2026/debian-12/prebuildfs/opt/bitnami/checksums/neo4j-2026.6.0-0-linux-arm64-debian-12.tar.gz.sha256
@@ -0,0 +1 @@
+d56a5e8fb5d3c29cbb2329d383d4bb930c2227bd4293533d67e140ed5a21f3cb  neo4j-2026.6.0-0-linux-arm64-debian-12.tar.gz
diff --git a/bitnami/neo4j/2026/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/neo4j/2026/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh
index a8293800d55c..c1d60a5c5f42 100644
--- a/bitnami/neo4j/2026/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh
+++ b/bitnami/neo4j/2026/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh
@@ -424,3 +424,23 @@ EOF
 WantedBy=bitnami.service
 EOF
 }
+
+########################
+# Register a SIGTERM handler that forwards the signal to all child processes.
+# Should be called at the start of run.sh, before launching any background processes.
+# Globals:
+#   None
+# Arguments:
+#   None
+# Returns:
+#   None
+#########################
+service_register_term_forwarder() {
+    _service_forward_term() {
+        warn "Caught signal SIGTERM, passing it to child processes..."
+        pgrep -P $$ | xargs kill -TERM 2>/dev/null
+        wait
+        exit $?
+    }
+    trap _service_forward_term TERM
+}