diff --git a/bitnami/postgresql-repmgr/18/debian-12/Dockerfile b/bitnami/postgresql-repmgr/18/debian-12/Dockerfile
index fd062b5d0073..bd2869153708 100644
--- a/bitnami/postgresql-repmgr/18/debian-12/Dockerfile
+++ b/bitnami/postgresql-repmgr/18/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="2026-05-28T11:34:21Z" \
+      org.opencontainers.image.created="2026-06-05T17:10:40Z" \
       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" \
@@ -29,7 +29,7 @@ RUN --mount=type=secret,id=downloads_url,env=SECRET_DOWNLOADS_URL \
     mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \
     COMPONENTS=( \
       "nss-wrapper-1.1.16-0-linux-${OS_ARCH}-debian-12" \
-      "postgresql-repmgr-18.4.0-0-linux-${OS_ARCH}-debian-12" \
+      "postgresql-repmgr-18.4.0-1-linux-${OS_ARCH}-debian-12" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
@@ -55,7 +55,7 @@ COPY rootfs /
 RUN /opt/bitnami/scripts/postgresql-repmgr/postunpack.sh
 ENV APP_VERSION="18.4.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/18/debian-12/prebuildfs/opt/bitnami/checksums/postgresql-repmgr-18.4.0-0-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/postgresql-repmgr/18/debian-12/prebuildfs/opt/bitnami/checksums/postgresql-repmgr-18.4.0-0-linux-amd64-debian-12.tar.gz.sha256
deleted file mode 100644
index e712eb3aff1b..000000000000
--- a/bitnami/postgresql-repmgr/18/debian-12/prebuildfs/opt/bitnami/checksums/postgresql-repmgr-18.4.0-0-linux-amd64-debian-12.tar.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-ac8f5deb7f4bbb9f2233efc1e36766d14168765e6944e339251f7462bc72fcae  postgresql-repmgr-18.4.0-0-linux-amd64-debian-12.tar.gz
diff --git a/bitnami/postgresql-repmgr/18/debian-12/prebuildfs/opt/bitnami/checksums/postgresql-repmgr-18.4.0-0-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/postgresql-repmgr/18/debian-12/prebuildfs/opt/bitnami/checksums/postgresql-repmgr-18.4.0-0-linux-arm64-debian-12.tar.gz.sha256
deleted file mode 100644
index a1ed5243b005..000000000000
--- a/bitnami/postgresql-repmgr/18/debian-12/prebuildfs/opt/bitnami/checksums/postgresql-repmgr-18.4.0-0-linux-arm64-debian-12.tar.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-50f7c2620a112785b3821806345863196a561857dba0bcb98f4b4f7333bd0559  postgresql-repmgr-18.4.0-0-linux-arm64-debian-12.tar.gz
diff --git a/bitnami/postgresql-repmgr/18/debian-12/prebuildfs/opt/bitnami/checksums/postgresql-repmgr-18.4.0-1-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/postgresql-repmgr/18/debian-12/prebuildfs/opt/bitnami/checksums/postgresql-repmgr-18.4.0-1-linux-amd64-debian-12.tar.gz.sha256
new file mode 100644
index 000000000000..7181e4ddb02e
--- /dev/null
+++ b/bitnami/postgresql-repmgr/18/debian-12/prebuildfs/opt/bitnami/checksums/postgresql-repmgr-18.4.0-1-linux-amd64-debian-12.tar.gz.sha256
@@ -0,0 +1 @@
+da1df111a1f414213905563073d7e22e1b397bbd3d557707fd5f7cac0efa4504  postgresql-repmgr-18.4.0-1-linux-amd64-debian-12.tar.gz
diff --git a/bitnami/postgresql-repmgr/18/debian-12/prebuildfs/opt/bitnami/checksums/postgresql-repmgr-18.4.0-1-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/postgresql-repmgr/18/debian-12/prebuildfs/opt/bitnami/checksums/postgresql-repmgr-18.4.0-1-linux-arm64-debian-12.tar.gz.sha256
new file mode 100644
index 000000000000..6f351ef8a569
--- /dev/null
+++ b/bitnami/postgresql-repmgr/18/debian-12/prebuildfs/opt/bitnami/checksums/postgresql-repmgr-18.4.0-1-linux-arm64-debian-12.tar.gz.sha256
@@ -0,0 +1 @@
+6a704348cb439fd4e8ba9c329f26186e7f372d2c9903e4c541958b45bc4c3c83  postgresql-repmgr-18.4.0-1-linux-arm64-debian-12.tar.gz
diff --git a/bitnami/postgresql-repmgr/18/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/postgresql-repmgr/18/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh
index 9d908c48579b..2d3c3bdb5f4a 100644
--- a/bitnami/postgresql-repmgr/18/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh
+++ b/bitnami/postgresql-repmgr/18/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh
@@ -170,7 +170,7 @@ ensure_user_exists() {
     if [[ -n "$home" ]]; then
         mkdir -p "$home"
         usermod -d "$home" "$user" >/dev/null 2>&1
-        configure_permissions_ownership "$home" -d "775" -f "664" -u "$user" -g "$group"
+        configure_permissions_ownership "$home" -d "775" -f "664" -u "$user" -g "$group" -n
     fi
 }
 
diff --git a/bitnami/postgresql-repmgr/18/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh b/bitnami/postgresql-repmgr/18/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh
index bbd31b26bb2c..3a996383cfab 100644
--- a/bitnami/postgresql-repmgr/18/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh
+++ b/bitnami/postgresql-repmgr/18/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh
@@ -20,7 +20,7 @@
 #########################
 is_int() {
     local -r int="${1:?missing value}"
-    if [[ "$int" =~ ^-?[0-9]+ ]]; then
+    if [[ "$int" =~ ^-?[0-9]+$ ]]; then
         true
     else
         false
diff --git a/bitnami/postgresql-repmgr/18/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh b/bitnami/postgresql-repmgr/18/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh
index f0d5a5cd3389..770861ecedcd 100644
--- a/bitnami/postgresql-repmgr/18/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh
+++ b/bitnami/postgresql-repmgr/18/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh
@@ -49,3 +49,36 @@ get_sematic_version () {
         fi
     fi
 }
+
+########################
+# Compares two semantic versions
+# Arguments:
+#   $1 - version1: first version to compare
+#   $2 - version2: second version to compare
+# Returns:
+#   -1 if version1 is less than version2
+#   0 if version1 is equal to version2
+#   1 if version1 is greater than version2
+#########################
+compare_semantic_versions() {
+    local version1="${1:?version1 is required}"
+    local version2="${2:?version2 is required}"
+    local major1 major2 minor1 minor2 patch1 patch2
+
+    major1="$(get_sematic_version "$version1" 1)"
+    major2="$(get_sematic_version "$version2" 1)"
+    minor1="$(get_sematic_version "$version1" 2)"
+    minor2="$(get_sematic_version "$version2" 2)"
+    patch1="$(get_sematic_version "$version1" 3)"
+    patch2="$(get_sematic_version "$version2" 3)"
+
+    if [[ "$major1" -eq "$major2" ]] && [[ "$minor1" -eq "$minor2" ]] && [[ "$patch1" -eq "$patch2" ]]; then
+        echo "0"
+    elif [[ "$major1" -lt "$major2" ]] ||
+      { [[ "$major1" -eq "$major2" ]] && [[ "$minor1" -lt "$minor2" ]]; } ||
+      { [[ "$major1" -eq "$major2" ]] && [[ "$minor1" -eq "$minor2" ]] && [[ "$patch1" -lt "$patch2" ]]; }; then
+        echo "-1"
+    else
+        echo "1"
+    fi
+}