diff --git a/bitnami/clickhouse-keeper/25/debian-12/Dockerfile b/bitnami/clickhouse-keeper/25/debian-12/Dockerfile
index f4f33c23c7c9..650fa13a249f 100644
--- a/bitnami/clickhouse-keeper/25/debian-12/Dockerfile
+++ b/bitnami/clickhouse-keeper/25/debian-12/Dockerfile
@@ -7,13 +7,13 @@ 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-18T12:52:05Z" \
+      org.opencontainers.image.created="2025-09-23T17:07:57Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/clickhouse-keeper/README.md" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/clickhouse-keeper" \
       org.opencontainers.image.title="clickhouse-keeper" \
       org.opencontainers.image.vendor="Broadcom, Inc." \
-      org.opencontainers.image.version="25.8.4"
+      org.opencontainers.image.version="25.8.5"
 
 ENV HOME="/" \
     OS_ARCH="${TARGETARCH:-amd64}" \
@@ -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=( \
-      "clickhouse-keeper-25.8.4-0-linux-${OS_ARCH}-debian-12" \
+      "clickhouse-keeper-25.8.5-0-linux-${OS_ARCH}-debian-12" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
@@ -47,7 +47,7 @@ RUN uninstall_packages curl
 
 COPY rootfs /
 RUN /opt/bitnami/scripts/clickhouse-keeper/postunpack.sh
-ENV APP_VERSION="25.8.4" \
+ENV APP_VERSION="25.8.5" \
     BITNAMI_APP_NAME="clickhouse-keeper" \
     IMAGE_REVISION="0" \
     PATH="/opt/bitnami/clickhouse-keeper/bin:/opt/bitnami/common/bin:$PATH" \
diff --git a/bitnami/clickhouse-keeper/25/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/clickhouse-keeper/25/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh
index 886962ebd276..a8293800d55c 100644
--- a/bitnami/clickhouse-keeper/25/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh
+++ b/bitnami/clickhouse-keeper/25/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