diff --git a/bitnami/postgresql-repmgr/13/debian-10/Dockerfile b/bitnami/postgresql-repmgr/13/debian-10/Dockerfile
index 3ae489dfe4b9..a2e16c68c137 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.0.0-debian-10-r30" \
+    BITNAMI_IMAGE_VERSION="13.0.0-debian-10-r31" \
     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 3d5090bad88a..33d2e50880e4 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
@@ -708,9 +708,14 @@ postgresql_custom_init_scripts() {
 #   None
 #########################
 postgresql_stop() {
+    local -r -a cmd=("pg_ctl" "stop" "-w" "-D" "$POSTGRESQL_DATA_DIR")
     if [[ -f "$POSTGRESQL_PID_FILE" ]]; then
         info "Stopping PostgreSQL..."
-        PGDATA="$POSTGRESQL_DATA_DIR" pg_ctl stop -w
+        if am_i_root; then
+          gosu "$POSTGRESQL_DAEMON_USER" "${cmd[@]}"
+        else
+          "${cmd[@]}"
+        fi
     fi
 }
 
diff --git a/bitnami/postgresql-repmgr/README.md b/bitnami/postgresql-repmgr/README.md
index cd2fca60bbc8..4538edd69bb2 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.0.0`, `13.0.0-debian-10-r30` (13/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/13.0.0-debian-10-r30/13/debian-10/Dockerfile)
+* [`13`, `13-debian-10`, `13.0.0`, `13.0.0-debian-10-r31` (13/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/13.0.0-debian-10-r31/13/debian-10/Dockerfile)
 * [`12`, `12-debian-10`, `12.4.0`, `12.4.0-debian-10-r84` (12/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/12.4.0-debian-10-r84/12/debian-10/Dockerfile)
 * [`11`, `11-debian-10`, `11.9.0`, `11.9.0-debian-10-r76`, `latest` (11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/11.9.0-debian-10-r76/11/debian-10/Dockerfile)
 * [`10`, `10-debian-10`, `10.14.0`, `10.14.0-debian-10-r85` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/10.14.0-debian-10-r85/10/debian-10/Dockerfile)