diff --git a/bitnami/etcd/3/ol-7/Dockerfile b/bitnami/etcd/3/ol-7/Dockerfile
index cc06ddb635e9..dcd2bf9107c0 100644
--- a/bitnami/etcd/3/ol-7/Dockerfile
+++ b/bitnami/etcd/3/ol-7/Dockerfile
@@ -12,7 +12,7 @@ RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stac
 COPY rootfs /
 RUN chmod g+rwX /opt/bitnami/etcd
 ENV BITNAMI_APP_NAME="etcd" \
-    BITNAMI_IMAGE_VERSION="3.4.3-ol-7-r35" \
+    BITNAMI_IMAGE_VERSION="3.4.3-ol-7-r36" \
     ETCDCTL_API="3" \
     ETCD_ADVERTISE_CLIENT_URLS="http://127.0.0.1:2379" \
     ETCD_DATA_DIR="/opt/bitnami/etcd/data/" \
diff --git a/bitnami/etcd/3/ol-7/prebuildfs/usr/local/bin/install_packages b/bitnami/etcd/3/ol-7/prebuildfs/usr/local/bin/install_packages
index 4218ab93690a..370f3516f403 100755
--- a/bitnami/etcd/3/ol-7/prebuildfs/usr/local/bin/install_packages
+++ b/bitnami/etcd/3/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/etcd/README.md b/bitnami/etcd/README.md
index f78b4c5459bc..3020f65d5448 100644
--- a/bitnami/etcd/README.md
+++ b/bitnami/etcd/README.md
@@ -46,7 +46,7 @@ Non-root container images add an extra layer of security and are generally recom
 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/).
 
 
-* [`3-ol-7`, `3.4.3-ol-7-r35` (3/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-etcd/blob/3.4.3-ol-7-r35/3/ol-7/Dockerfile)
+* [`3-ol-7`, `3.4.3-ol-7-r36` (3/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-etcd/blob/3.4.3-ol-7-r36/3/ol-7/Dockerfile)
 * [`3-debian-9`, `3.4.3-debian-9-r14`, `3`, `3.4.3`, `3.4.3-r14`, `latest` (3/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-etcd/blob/3.4.3-debian-9-r14/3/debian-9/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/etcd GitHub repo](https://github.com/bitnami/bitnami-docker-etcd).