diff --git a/bitnami/postgresql-repmgr/13/debian-10/Dockerfile b/bitnami/postgresql-repmgr/13/debian-10/Dockerfile
index f78c9db3120d..2fdc17dafeec 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-r36" \
+    BITNAMI_IMAGE_VERSION="13.0.0-debian-10-r37" \
     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/postgresql-env.sh b/bitnami/postgresql-repmgr/13/debian-10/rootfs/opt/bitnami/scripts/postgresql-env.sh
index 0b3d032ad272..1f75866b906b 100644
--- a/bitnami/postgresql-repmgr/13/debian-10/rootfs/opt/bitnami/scripts/postgresql-env.sh
+++ b/bitnami/postgresql-repmgr/13/debian-10/rootfs/opt/bitnami/scripts/postgresql-env.sh
@@ -20,10 +20,11 @@ export BITNAMI_DEBUG="${BITNAMI_DEBUG:-false}"
 postgresql_env_vars=(
     POSTGRESQL_DATA_DIR
     POSTGRESQL_INIT_MAX_TIMEOUT
+    POSTGRESQL_PGCTLTIMEOUT
+    POSTGRESQL_SHUTDOWN_MODE
     POSTGRESQL_CLUSTER_APP_NAME
     POSTGRESQL_DATABASE
     POSTGRESQL_INITDB_ARGS
-    POSTGRESQL_PGCTLTIMEOUT
     ALLOW_EMPTY_PASSWORD
     POSTGRESQL_INITDB_WAL_DIR
     POSTGRESQL_MASTER_HOST
@@ -78,7 +79,6 @@ postgresql_env_vars=(
     POSTGRESQL_PGHBA_REMOVE_FILTERS
     POSTGRESQL_USERNAME_CONNECTION_LIMIT
     POSTGRESQL_POSTGRES_CONNECTION_LIMIT
-    POSTGRESQL_SHUTDOWN_MODE
     REPMGR_DATA_DIR
     REPMGR_NODE_ID
     REPMGR_NODE_NAME
@@ -105,6 +105,7 @@ postgresql_env_vars=(
     PGCONNECT_TIMEOUT
     POSTGRES_DATA_DIR
     PGDATA
+    POSTGRES_SHUTDOWN_MODE
     POSTGRES_CLUSTER_APP_NAME
     POSTGRES_DATABASE
     POSTGRES_DB
@@ -164,7 +165,6 @@ postgresql_env_vars=(
     POSTGRES_PGHBA_REMOVE_FILTERS
     POSTGRES_USER_CONNECTION_LIMIT
     POSTGRES_POSTGRES_CONNECTION_LIMIT
-    POSTGRES_SHUTDOWN_MODE
 )
 for env_var in "${postgresql_env_vars[@]}"; do
     file_env_var="${env_var}_FILE"
@@ -202,7 +202,6 @@ export POSTGRESQL_DAEMON_GROUP="postgres"
 
 # PostgreSQL settings
 export POSTGRESQL_INIT_MAX_TIMEOUT="${POSTGRESQL_INIT_MAX_TIMEOUT:-60}"
-POSTGRESQL_PGCTLTIMEOUT="${POSTGRESQL_PGCTLTIMEOUT:-"${PGCTLTIMEOUT:-}"}"
 export POSTGRESQL_PGCTLTIMEOUT="${POSTGRESQL_PGCTLTIMEOUT:-60}"
 POSTGRESQL_SHUTDOWN_MODE="${POSTGRESQL_SHUTDOWN_MODE:-"${POSTGRES_SHUTDOWN_MODE:-}"}"
 export POSTGRESQL_SHUTDOWN_MODE="${POSTGRESQL_SHUTDOWN_MODE:-fast}"
diff --git a/bitnami/postgresql-repmgr/README.md b/bitnami/postgresql-repmgr/README.md
index e5da6b138d28..fd6bf0d63df3 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-r36` (13/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/13.0.0-debian-10-r36/13/debian-10/Dockerfile)
+* [`13`, `13-debian-10`, `13.0.0`, `13.0.0-debian-10-r37` (13/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/13.0.0-debian-10-r37/13/debian-10/Dockerfile)
 * [`12`, `12-debian-10`, `12.4.0`, `12.4.0-debian-10-r90` (12/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/12.4.0-debian-10-r90/12/debian-10/Dockerfile)
 * [`11`, `11-debian-10`, `11.9.0`, `11.9.0-debian-10-r83`, `latest` (11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/11.9.0-debian-10-r83/11/debian-10/Dockerfile)
 * [`10`, `10-debian-10`, `10.14.0`, `10.14.0-debian-10-r91` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/10.14.0-debian-10-r91/10/debian-10/Dockerfile)