diff --git a/bitnami/fluentd/1/debian-12/Dockerfile b/bitnami/fluentd/1/debian-12/Dockerfile
index fb6c2929df32..43cf6c27871f 100644
--- a/bitnami/fluentd/1/debian-12/Dockerfile
+++ b/bitnami/fluentd/1/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-07-04T12:29:08Z" \
+      org.opencontainers.image.created="2026-07-14T06:44:36Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/fluentd/README.md" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/fluentd" \
@@ -51,7 +51,7 @@ RUN /opt/bitnami/scripts/fluentd/postunpack.sh
 ENV APP_VERSION="1.19.3" \
     BITNAMI_APP_NAME="fluentd" \
     GEM_HOME="/opt/bitnami/fluentd" \
-    IMAGE_REVISION="1" \
+    IMAGE_REVISION="2" \
     PATH="/opt/bitnami/ruby/bin:/opt/bitnami/fluentd/bin:$PATH"
 
 EXPOSE 5140 24224
diff --git a/bitnami/fluentd/1/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/fluentd/1/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh
index a8293800d55c..c1d60a5c5f42 100644
--- a/bitnami/fluentd/1/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh
+++ b/bitnami/fluentd/1/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
+}