diff --git a/bitnami/postgresql-repmgr/13/debian-10/Dockerfile b/bitnami/postgresql-repmgr/13/debian-10/Dockerfile
index b54294141ad1..49b6dd4c5630 100644
--- a/bitnami/postgresql-repmgr/13/debian-10/Dockerfile
+++ b/bitnami/postgresql-repmgr/13/debian-10/Dockerfile
@@ -24,7 +24,7 @@ COPY rootfs /
 RUN /opt/bitnami/scripts/postgresql-repmgr/postunpack.sh
 RUN /opt/bitnami/scripts/locales/add-extra-locales.sh
 ENV BITNAMI_APP_NAME="postgresql-repmgr" \
-    BITNAMI_IMAGE_VERSION="13.1.0-debian-10-r17" \
+    BITNAMI_IMAGE_VERSION="13.1.0-debian-10-r18" \
     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/13/debian-10/rootfs/opt/bitnami/scripts/libpostgresql.sh b/bitnami/postgresql-repmgr/13/debian-10/rootfs/opt/bitnami/scripts/libpostgresql.sh
index 0404dd601f6a..21babc244f00 100644
--- a/bitnami/postgresql-repmgr/13/debian-10/rootfs/opt/bitnami/scripts/libpostgresql.sh
+++ b/bitnami/postgresql-repmgr/13/debian-10/rootfs/opt/bitnami/scripts/libpostgresql.sh
@@ -278,7 +278,7 @@ postgresql_create_pghba() {
 postgresql_allow_local_connection() {
     cat <<EOF >>"$POSTGRESQL_PGHBA_FILE"
 local    all             all                                     trust
-host     all             all        127.0.0.1/0                  trust
+host     all             all        127.0.0.1/32                 trust
 host     all             all        ::1/128                      trust
 EOF
 }
diff --git a/bitnami/postgresql-repmgr/13/debian-10/rootfs/opt/bitnami/scripts/librepmgr.sh b/bitnami/postgresql-repmgr/13/debian-10/rootfs/opt/bitnami/scripts/librepmgr.sh
index 42f04963406c..21c782accd98 100644
--- a/bitnami/postgresql-repmgr/13/debian-10/rootfs/opt/bitnami/scripts/librepmgr.sh
+++ b/bitnami/postgresql-repmgr/13/debian-10/rootfs/opt/bitnami/scripts/librepmgr.sh
@@ -643,6 +643,8 @@ repmgr_initialize() {
         postgresql_start_bg
         repmgr_unregister_standby
         repmgr_register_standby
-        repmgr_standby_follow
+        if [[ "$psql_major_version" -lt "12" ]]; then
+           repmgr_standby_follow
+        fi
     fi
 }
diff --git a/bitnami/postgresql-repmgr/README.md b/bitnami/postgresql-repmgr/README.md
index f9643ec754ec..e72788e12d3b 100644
--- a/bitnami/postgresql-repmgr/README.md
+++ b/bitnami/postgresql-repmgr/README.md
@@ -43,7 +43,7 @@ Bitnami containers can be used with [Kubeapps](https://kubeapps.com/) for deploy
 Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/).
 
 
-* [`13`, `13-debian-10`, `13.1.0`, `13.1.0-debian-10-r17` (13/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/13.1.0-debian-10-r17/13/debian-10/Dockerfile)
+* [`13`, `13-debian-10`, `13.1.0`, `13.1.0-debian-10-r18` (13/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/13.1.0-debian-10-r18/13/debian-10/Dockerfile)
 * [`12`, `12-debian-10`, `12.5.0`, `12.5.0-debian-10-r18` (12/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/12.5.0-debian-10-r18/12/debian-10/Dockerfile)
 * [`11`, `11-debian-10`, `11.10.0`, `11.10.0-debian-10-r17`, `latest` (11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/11.10.0-debian-10-r17/11/debian-10/Dockerfile)
 * [`10`, `10-debian-10`, `10.15.0`, `10.15.0-debian-10-r17` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/10.15.0-debian-10-r17/10/debian-10/Dockerfile)