diff --git a/bitnami/postgresql-repmgr/17/debian-12/Dockerfile b/bitnami/postgresql-repmgr/17/debian-12/Dockerfile
index a56671469907..c5d57c0a1fff 100644
--- a/bitnami/postgresql-repmgr/17/debian-12/Dockerfile
+++ b/bitnami/postgresql-repmgr/17/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-11T11:28:26Z" \
+      org.opencontainers.image.created="2025-09-20T06:20:36Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/postgresql-repmgr/README.md" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/postgresql-repmgr" \
@@ -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=( \
-      "postgresql-repmgr-17.6.0-3-linux-${OS_ARCH}-debian-12" \
+      "postgresql-repmgr-17.6.0-4-linux-${OS_ARCH}-debian-12" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
@@ -58,7 +58,7 @@ RUN echo 'en_GB.UTF-8 UTF-8' >> /etc/locale.gen
 RUN /opt/bitnami/scripts/locales/generate-locales.sh
 ENV APP_VERSION="17.6.0" \
     BITNAMI_APP_NAME="postgresql-repmgr" \
-    IMAGE_REVISION="5" \
+    IMAGE_REVISION="6" \
     LANG="en_US.UTF-8" \
     LANGUAGE="en_US:en" \
     NSS_WRAPPER_LIB="/opt/bitnami/common/lib/libnss_wrapper.so" \
diff --git a/bitnami/postgresql-repmgr/17/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/postgresql-repmgr/17/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh
index 886962ebd276..a8293800d55c 100644
--- a/bitnami/postgresql-repmgr/17/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh
+++ b/bitnami/postgresql-repmgr/17/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