diff --git a/bitnami/zipkin/3/debian-12/Dockerfile b/bitnami/zipkin/3/debian-12/Dockerfile
index 40f2ed4bce60..0ee6f23d66a0 100644
--- a/bitnami/zipkin/3/debian-12/Dockerfile
+++ b/bitnami/zipkin/3/debian-12/Dockerfile
@@ -7,7 +7,7 @@ ARG DOWNLOADS_URL="downloads.bitnami.com/files/stacksmith"
 ARG TARGETARCH
 
 LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
-      org.opencontainers.image.created="2025-09-06T22:03:13Z" \
+      org.opencontainers.image.created="2025-10-06T22:23:44Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/zipkin/README.md" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/zipkin" \
@@ -28,7 +28,7 @@ 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=( \
-      "jre-21.0.8-12-0-linux-${OS_ARCH}-debian-12" \
+      "jre-21.0.8-12-1-linux-${OS_ARCH}-debian-12" \
       "zipkin-3.5.1-0-linux-${OS_ARCH}-debian-12" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
@@ -48,7 +48,7 @@ RUN uninstall_packages curl
 
 ENV APP_VERSION="3.5.1" \
     BITNAMI_APP_NAME="zipkin" \
-    IMAGE_REVISION="6" \
+    IMAGE_REVISION="7" \
     PATH="/opt/bitnami/java/bin:/opt/bitnami/zipkin/bin:$PATH"
 
 EXPOSE 9411
diff --git a/bitnami/zipkin/3/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/zipkin/3/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh
index 886962ebd276..a8293800d55c 100644
--- a/bitnami/zipkin/3/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh
+++ b/bitnami/zipkin/3/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh
@@ -259,6 +259,8 @@ generate_systemd_conf() {
     local success_exit_status=""
     local custom_service_content=""
     local working_directory=""
+    local timeout_start_sec="2min"
+    local timeout_stop_sec="30s"
     # Parse CLI flags
     shift
     while [[ "$#" -gt 0 ]]; do
@@ -277,6 +279,8 @@ generate_systemd_conf() {
             | --success-exit-status \
             | --custom-service-content \
             | --working-directory \
+            | --timeout-start-sec \
+            | --timeout-stop-sec \
             )
                 var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")"
                 shift
@@ -402,8 +406,8 @@ EOF
     fi
     cat >> "$service_file" <<EOF
 # Optimizations
-TimeoutStartSec=2min
-TimeoutStopSec=30s
+TimeoutStartSec=${timeout_start_sec}
+TimeoutStopSec=${timeout_stop_sec}
 IgnoreSIGPIPE=no
 KillMode=mixed
 EOF
diff --git a/bitnami/zipkin/README.md b/bitnami/zipkin/README.md
index d45ba209f3c2..4d9268016c97 100644
--- a/bitnami/zipkin/README.md
+++ b/bitnami/zipkin/README.md
@@ -89,6 +89,12 @@ docker run --name git bitnami/zipkin:latest --version
 
 Read the [official Zipkin documentation](https://zipkin.io/pages/quickstart.html) documentation for the list of available commands.
 
+### FIPS configuration in Bitnami Secure Images
+
+The Bitnami Zipkin Docker image from the [Bitnami Secure Images](https://www.arrow.com/globalecs/uk/products/bitnami-secure-images/) catalog includes extra features and settings to configure the container with FIPS capabilities. You can configure the next environment variables:
+
+- `OPENSSL_FIPS`: whether OpenSSL runs in FIPS mode or not. `yes` (default), `no`.
+
 ## Maintenance
 
 ### Upgrade this image