diff --git a/bitnami/postgresql-repmgr/12/ol-7/Dockerfile b/bitnami/postgresql-repmgr/12/ol-7/Dockerfile
index 82e2a88d5725..78ff71f3a27a 100644
--- a/bitnami/postgresql-repmgr/12/ol-7/Dockerfile
+++ b/bitnami/postgresql-repmgr/12/ol-7/Dockerfile
@@ -10,13 +10,14 @@ ENV BITNAMI_PKG_CHMOD="-R g+rwX" \
 COPY prebuildfs /
 # Install required system packages and dependencies
 RUN install_packages ca-certificates curl cyrus-sasl-lib glibc gzip hostname keyutils-libs krb5-libs libaio-devel libcom_err libedit libgcc libicu libselinux libstdc++ libuuid libxml2 libxslt ncurses-libs nspr nss nss-softokn-freebl nss-util openldap openssl-libs pcre procps-ng sqlite sudo tar which xz-libs zlib
-RUN . ./libcomponent.sh && component_unpack "postgresql-repmgr" "12.1.0-0" --checksum b653d8cbafe4cdd9b1e297d0a55778b42065b771e04a4e02ba1fb24c2bba9052
+RUN . ./libcomponent.sh && component_unpack "postgresql-repmgr" "12.1.0-1" --checksum 8aa2b24f7cf029c1b185caac3ea0d094c05323fbde24f054555b3cd073993450
+RUN curl --silent -L https://github.com/tianon/gosu/releases/download/1.11/gosu-amd64 > /usr/local/bin/gosu && echo 0b843df6d86e270c5b0f5cbd3c326a04e18f4b7f9b8457fa497b0454c4b138d7 /usr/local/bin/gosu | sha256sum --check && chmod u+x /usr/local/bin/gosu && mkdir -p /opt/bitnami/licenses && curl --silent -L https://raw.githubusercontent.com/tianon/gosu/master/LICENSE > /opt/bitnami/licenses/gosu-1.11.txt
 
 COPY rootfs /
 RUN rpm -Uvh --nodeps $(repoquery --location nss_wrapper)
 RUN /postunpack.sh
 ENV BITNAMI_APP_NAME="postgresql-repmgr" \
-    BITNAMI_IMAGE_VERSION="12.1.0-ol-7-r4" \
+    BITNAMI_IMAGE_VERSION="12.1.0-ol-7-r5" \
     NAMI_PREFIX="/.nami" \
     NSS_WRAPPER_LIB="/usr/lib64/libnss_wrapper.so" \
     PATH="/opt/bitnami/postgresql-repmgr/bin:/opt/bitnami/repmgr/bin:/opt/bitnami/postgresql/bin:$PATH"
diff --git a/bitnami/postgresql-repmgr/12/ol-7/prebuildfs/usr/local/bin/install_packages b/bitnami/postgresql-repmgr/12/ol-7/prebuildfs/usr/local/bin/install_packages
index 4218ab93690a..370f3516f403 100755
--- a/bitnami/postgresql-repmgr/12/ol-7/prebuildfs/usr/local/bin/install_packages
+++ b/bitnami/postgresql-repmgr/12/ol-7/prebuildfs/usr/local/bin/install_packages
@@ -1,20 +1,29 @@
 #!/bin/sh
-set -e
-set -u
-n=0
+set -eu
+
+if [[ -n "oracle-epel-release-el7" ]]; then
+    if ! yum list installed oracle-epel-release-el7 >/dev/null 2>&1; then
+        yum -y install oracle-epel-release-el7 >/dev/null 2>&1
+        CODE=$?
+        if (( $CODE != 0 )); then
+          echo "EPEL repository installation failed"
+          exit $CODE
+        fi
+    fi
+fi
+
 max=2
-until [ $n -gt $max ]; do
+for ((n = 1 ; n <= max ; n+=1 )); do
     set +e
     yum --enablerepo base,updates,ol7_developer_EPEL,ol7_optional_latest install -y "$@"
     CODE=$?
     set -e
-    if [ $CODE -eq 0 ]; then
+    if (( $CODE == 0 )); then
         break
     fi
-    if [ $n -eq $max ]; then
+    if (( $n == $max )); then
         exit $CODE
     fi
     echo "yum failed, retrying"
-    n=$(($n + 1))
 done
 rm -r /var/cache/yum
diff --git a/bitnami/postgresql-repmgr/README.md b/bitnami/postgresql-repmgr/README.md
index 38721079b43d..21e854b2a0bf 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/containers/how-to/understand-rolling-tags-containers/).
 
 
-* [`12-ol-7`, `12.1.0-ol-7-r4` (12/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/12.1.0-ol-7-r4/12/ol-7/Dockerfile)
+* [`12-ol-7`, `12.1.0-ol-7-r5` (12/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/12.1.0-ol-7-r5/12/ol-7/Dockerfile)
 * [`12-debian-9`, `12.1.0-debian-9-r5`, `12`, `12.1.0`, `12.1.0-r5` (12/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/12.1.0-debian-9-r5/12/debian-9/Dockerfile)
 * [`12-centos-7`, `12.1.0-centos-7-r7` (12/centos-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/12.1.0-centos-7-r7/12/centos-7/Dockerfile)
 * [`11-ol-7`, `11.6.0-ol-7-r4` (11/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/11.6.0-ol-7-r4/11/ol-7/Dockerfile)