diff --git a/bitnami/matomo/5/debian-12/Dockerfile b/bitnami/matomo/5/debian-12/Dockerfile
index 8a9dafb8cff8..50c1e450d5ae 100644
--- a/bitnami/matomo/5/debian-12/Dockerfile
+++ b/bitnami/matomo/5/debian-12/Dockerfile
@@ -7,7 +7,7 @@ ARG DOWNLOADS_URL="https://downloads.bitnami.com/files/stacksmith"
 ARG TARGETARCH
 
 LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
-      org.opencontainers.image.created="2026-06-24T18:26:55Z" \
+      org.opencontainers.image.created="2026-07-09T12:46:44Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/matomo/README.md" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/matomo" \
@@ -28,13 +28,13 @@ RUN --mount=type=secret,id=downloads_url,env=SECRET_DOWNLOADS_URL \
     DOWNLOADS_URL=${SECRET_DOWNLOADS_URL:-${DOWNLOADS_URL}} ; \
     mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \
     COMPONENTS=( \
-      "render-template-1.0.9-167-linux-${OS_ARCH}-debian-12" \
-      "php-8.4.22-2-linux-${OS_ARCH}-debian-12" \
-      "apache-2.4.68-1-linux-${OS_ARCH}-debian-12" \
+      "render-template-1.0.9-168-linux-${OS_ARCH}-debian-12" \
+      "php-8.4.23-0-linux-${OS_ARCH}-debian-12" \
+      "apache-2.4.68-3-linux-${OS_ARCH}-debian-12" \
       "mysql-client-12.3.2-1-linux-${OS_ARCH}-debian-12" \
       "postgresql-lib-18.4.0-0-linux-${OS_ARCH}-debian-12" \
-      "libphp-8.4.22-1-linux-${OS_ARCH}-debian-12" \
-      "ini-file-1.4.9-12-linux-${OS_ARCH}-debian-12" \
+      "libphp-8.4.23-0-linux-${OS_ARCH}-debian-12" \
+      "ini-file-1.4.9-13-linux-${OS_ARCH}-debian-12" \
       "matomo-5.11.2-0-linux-${OS_ARCH}-debian-12" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
@@ -62,7 +62,7 @@ ENV APACHE_HTTPS_PORT_NUMBER="" \
     APACHE_HTTP_PORT_NUMBER="" \
     APP_VERSION="5.11.2" \
     BITNAMI_APP_NAME="matomo" \
-    IMAGE_REVISION="1" \
+    IMAGE_REVISION="2" \
     LD_LIBRARY_PATH="/opt/bitnami/postgresql/lib" \
     PATH="/opt/bitnami/common/bin:/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/apache/bin:/opt/bitnami/mysql/bin:$PATH"
 
diff --git a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/apache-2.4.68-1-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/apache-2.4.68-1-linux-amd64-debian-12.tar.gz.sha256
deleted file mode 100644
index 1639960d88b2..000000000000
--- a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/apache-2.4.68-1-linux-amd64-debian-12.tar.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-b3be93429d076cee4147d1f21c9c8af0d96eb127dd3d8bd57a16a4b0b419c3d8  apache-2.4.68-1-linux-amd64-debian-12.tar.gz
diff --git a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/apache-2.4.68-1-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/apache-2.4.68-1-linux-arm64-debian-12.tar.gz.sha256
deleted file mode 100644
index 223e5d970b00..000000000000
--- a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/apache-2.4.68-1-linux-arm64-debian-12.tar.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-4e01e021129ade2817cd93e5d996e8b7b8677eafbaaedfd22be3ad551e09c975  apache-2.4.68-1-linux-arm64-debian-12.tar.gz
diff --git a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/apache-2.4.68-3-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/apache-2.4.68-3-linux-amd64-debian-12.tar.gz.sha256
new file mode 100644
index 000000000000..953dfb78d9bf
--- /dev/null
+++ b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/apache-2.4.68-3-linux-amd64-debian-12.tar.gz.sha256
@@ -0,0 +1 @@
+29d58d0def417412447253e1f5b6ae72e38d04b45f41cef9bdc939f3937a2ef0  apache-2.4.68-3-linux-amd64-debian-12.tar.gz
diff --git a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/apache-2.4.68-3-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/apache-2.4.68-3-linux-arm64-debian-12.tar.gz.sha256
new file mode 100644
index 000000000000..b2e3b071fc72
--- /dev/null
+++ b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/apache-2.4.68-3-linux-arm64-debian-12.tar.gz.sha256
@@ -0,0 +1 @@
+392467016d5dcf0128a43a06bd60daf0d8c5fb37d24498b3e3f79092de9bac3c  apache-2.4.68-3-linux-arm64-debian-12.tar.gz
diff --git a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-12-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-12-linux-amd64-debian-12.tar.gz.sha256
deleted file mode 100644
index d07b04443b5d..000000000000
--- a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-12-linux-amd64-debian-12.tar.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-aba4a9b96e5a3b29743fe09c4b3279c789bace4171fe34574d166668dfc59523  ini-file-1.4.9-12-linux-amd64-debian-12.tar.gz
diff --git a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-12-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-12-linux-arm64-debian-12.tar.gz.sha256
deleted file mode 100644
index b5397259b807..000000000000
--- a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-12-linux-arm64-debian-12.tar.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-262a2d83e7294bb3adf0664ece04686f162a6355713981c7677634f2645505f0  ini-file-1.4.9-12-linux-arm64-debian-12.tar.gz
diff --git a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-13-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-13-linux-amd64-debian-12.tar.gz.sha256
new file mode 100644
index 000000000000..008faba52f43
--- /dev/null
+++ b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-13-linux-amd64-debian-12.tar.gz.sha256
@@ -0,0 +1 @@
+16c20658d1341bd5b925060c770e5007f8df19ce79bf73b3fedc5653c9b73a08  ini-file-1.4.9-13-linux-amd64-debian-12.tar.gz
diff --git a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-13-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-13-linux-arm64-debian-12.tar.gz.sha256
new file mode 100644
index 000000000000..6c8c65eeeef7
--- /dev/null
+++ b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-13-linux-arm64-debian-12.tar.gz.sha256
@@ -0,0 +1 @@
+07d509365514e811d0cd3727d33add8dcc9de3382e3220f7b839d617846e5e9e  ini-file-1.4.9-13-linux-arm64-debian-12.tar.gz
diff --git a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/libphp-8.4.22-1-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/libphp-8.4.22-1-linux-amd64-debian-12.tar.gz.sha256
deleted file mode 100644
index bbe36d2f78dd..000000000000
--- a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/libphp-8.4.22-1-linux-amd64-debian-12.tar.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-a64a1cb062f7bdb9ea94bfd0f79d65685d98f22342b2ecfd0e231b183b605000  libphp-8.4.22-1-linux-amd64-debian-12.tar.gz
diff --git a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/libphp-8.4.22-1-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/libphp-8.4.22-1-linux-arm64-debian-12.tar.gz.sha256
deleted file mode 100644
index e3ce1c15b2b9..000000000000
--- a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/libphp-8.4.22-1-linux-arm64-debian-12.tar.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-e774c534daba5c95201b8e57a6e13e8750b02bafbc8bdfec3d7ef59b520e647a  libphp-8.4.22-1-linux-arm64-debian-12.tar.gz
diff --git a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/libphp-8.4.23-0-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/libphp-8.4.23-0-linux-amd64-debian-12.tar.gz.sha256
new file mode 100644
index 000000000000..69f7f1bf1390
--- /dev/null
+++ b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/libphp-8.4.23-0-linux-amd64-debian-12.tar.gz.sha256
@@ -0,0 +1 @@
+ae0208f3877e76a6941c78b63b0136afed43d4f33c489b845d364145ea6c3ce6  libphp-8.4.23-0-linux-amd64-debian-12.tar.gz
diff --git a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/libphp-8.4.23-0-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/libphp-8.4.23-0-linux-arm64-debian-12.tar.gz.sha256
new file mode 100644
index 000000000000..c2ee6627b780
--- /dev/null
+++ b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/libphp-8.4.23-0-linux-arm64-debian-12.tar.gz.sha256
@@ -0,0 +1 @@
+2cb7c9d4e46f9703c7e3c5df2d89ac059bca78f0dec0a7abf7812803a3bedf4a  libphp-8.4.23-0-linux-arm64-debian-12.tar.gz
diff --git a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/php-8.4.22-2-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/php-8.4.22-2-linux-amd64-debian-12.tar.gz.sha256
deleted file mode 100644
index 5203ddda7998..000000000000
--- a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/php-8.4.22-2-linux-amd64-debian-12.tar.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-1f01086aa4ad4c49edcbadfbdcd6cf0fea64c9bdc1bb2e5cc11821165e8f8f12  php-8.4.22-2-linux-amd64-debian-12.tar.gz
diff --git a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/php-8.4.22-2-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/php-8.4.22-2-linux-arm64-debian-12.tar.gz.sha256
deleted file mode 100644
index 2bece8874d5e..000000000000
--- a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/php-8.4.22-2-linux-arm64-debian-12.tar.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-b0d367de9e99661609838cb902a0d32f871a995c0c8e9e99ed9badb153d4ae1c  php-8.4.22-2-linux-arm64-debian-12.tar.gz
diff --git a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/php-8.4.23-0-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/php-8.4.23-0-linux-amd64-debian-12.tar.gz.sha256
new file mode 100644
index 000000000000..e673ce557f19
--- /dev/null
+++ b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/php-8.4.23-0-linux-amd64-debian-12.tar.gz.sha256
@@ -0,0 +1 @@
+b6b50cb9917d7ace99b70ad1f162ba6d1bce4548d190efbb7b8bbb8f79b0e530  php-8.4.23-0-linux-amd64-debian-12.tar.gz
diff --git a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/php-8.4.23-0-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/php-8.4.23-0-linux-arm64-debian-12.tar.gz.sha256
new file mode 100644
index 000000000000..3252482c2ccb
--- /dev/null
+++ b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/php-8.4.23-0-linux-arm64-debian-12.tar.gz.sha256
@@ -0,0 +1 @@
+c0ecea556ccc449af8589c39f02612fdfc9c3282479b17501c5e517a4904abc4  php-8.4.23-0-linux-arm64-debian-12.tar.gz
diff --git a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-167-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-167-linux-amd64-debian-12.tar.gz.sha256
deleted file mode 100644
index 5678e3bf679f..000000000000
--- a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-167-linux-amd64-debian-12.tar.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-f311b56146985169ff7d24083cbb4786b68f3f668707ec04901b54b91bec4d98  render-template-1.0.9-167-linux-amd64-debian-12.tar.gz
diff --git a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-167-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-167-linux-arm64-debian-12.tar.gz.sha256
deleted file mode 100644
index 8b1c3ffbce03..000000000000
--- a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-167-linux-arm64-debian-12.tar.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-0904d2f41140fa1f027ab31e6303d5f648a71b9ab241510a69188f7970d59c02  render-template-1.0.9-167-linux-arm64-debian-12.tar.gz
diff --git a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-168-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-168-linux-amd64-debian-12.tar.gz.sha256
new file mode 100644
index 000000000000..ad4b4d3450af
--- /dev/null
+++ b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-168-linux-amd64-debian-12.tar.gz.sha256
@@ -0,0 +1 @@
+eea5319a0369a101ac118a9c7bd50230c8041dc22cbe978154431d0127c957ef  render-template-1.0.9-168-linux-amd64-debian-12.tar.gz
diff --git a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-168-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-168-linux-arm64-debian-12.tar.gz.sha256
new file mode 100644
index 000000000000..93b8eea1d90b
--- /dev/null
+++ b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-168-linux-arm64-debian-12.tar.gz.sha256
@@ -0,0 +1 @@
+a75c267e3399d590bceb20097f3da37e795ce2db3b6913548562cb5eb629c211  render-template-1.0.9-168-linux-arm64-debian-12.tar.gz
diff --git a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh
index a8293800d55c..c1d60a5c5f42 100644
--- a/bitnami/matomo/5/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh
+++ b/bitnami/matomo/5/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
+}