diff --git a/bitnami/tensorflow-serving/2/debian-12/Dockerfile b/bitnami/tensorflow-serving/2/debian-12/Dockerfile
index ef3da1e570dd..383ad26c84b2 100644
--- a/bitnami/tensorflow-serving/2/debian-12/Dockerfile
+++ b/bitnami/tensorflow-serving/2/debian-12/Dockerfile
@@ -8,7 +8,7 @@ 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="2025-09-07T02:47:46Z" \
+      org.opencontainers.image.created="2025-10-07T03:16:01Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/tensorflow-serving/README.md" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/tensorflow-serving" \
@@ -54,7 +54,7 @@ RUN /opt/bitnami/scripts/java/postunpack.sh
 RUN /opt/bitnami/scripts/tensorflow-serving/postunpack.sh
 ENV APP_VERSION="2.19.1" \
     BITNAMI_APP_NAME="tensorflow-serving" \
-    IMAGE_REVISION="2" \
+    IMAGE_REVISION="3" \
     JAVA_HOME="/opt/bitnami/java"
 
 EXPOSE 8500
diff --git a/bitnami/tensorflow-serving/2/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/tensorflow-serving/2/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh
index 886962ebd276..a8293800d55c 100644
--- a/bitnami/tensorflow-serving/2/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh
+++ b/bitnami/tensorflow-serving/2/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/tensorflow-serving/README.md b/bitnami/tensorflow-serving/README.md
index c82dc2e6dfeb..06a7aa8399f5 100644
--- a/bitnami/tensorflow-serving/README.md
+++ b/bitnami/tensorflow-serving/README.md
@@ -271,6 +271,12 @@ or using Docker Compose:
 docker-compose restart tensorflow-serving
 ```
 
+### FIPS configuration in Bitnami Secure Images
+
+The Bitnami TensorFlow Serving 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`.
+
 ## Logging
 
 The Bitnami TensorFlow Serving Docker image sends the container logs to the `stdout`. To view the logs: