diff --git a/bitnami/metrics-server/0/ol-7/Dockerfile b/bitnami/metrics-server/0/ol-7/Dockerfile
index cf5caaa7d2a0..9f7f8e7f5d6a 100644
--- a/bitnami/metrics-server/0/ol-7/Dockerfile
+++ b/bitnami/metrics-server/0/ol-7/Dockerfile
@@ -1,4 +1,4 @@
-FROM bitnami/oraclelinux-extras:7-r34 as buildenv
+FROM bitnami/oraclelinux-extras:7-r36 as buildenv
 
 RUN install_packages ca-certificates wget
 RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/metrics-server-0.2.1-0-linux-x86_64-ol-7.tar.gz && \
@@ -8,12 +8,12 @@ RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stac
 
 ##################
 
-FROM bitnami/oraclelinux-extras:7-r34
+FROM bitnami/oraclelinux-extras:7-r36
 LABEL maintainer "Bitnami <containers@bitnami.com>"
 
 COPY --from=buildenv /opt/bitnami/metrics-server /opt/bitnami/metrics-server
 ENV BITNAMI_APP_NAME="metrics-server" \
-    BITNAMI_IMAGE_VERSION="0.2.1-ol-7-r1" \
+    BITNAMI_IMAGE_VERSION="0.2.1-ol-7-r2" \
     PATH="/opt/bitnami/metrics-server/bin:$PATH"
 
 RUN install_packages ca-certificates
diff --git a/bitnami/metrics-server/README.md b/bitnami/metrics-server/README.md
index fb91ab17e60c..09c325e53fd3 100644
--- a/bitnami/metrics-server/README.md
+++ b/bitnami/metrics-server/README.md
@@ -24,8 +24,8 @@ $ docker run --name metrics-server bitnami/metrics-server:latest
 
 # Supported tags and respective `Dockerfile` links
 
-* [`0-ol-7`, `0.2.1-ol-7-r1` (0/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-metrics-server/blob/0.2.1-ol-7-r1/0/ol-7/Dockerfile)
-* [`0-debian-9`, `0.2.1-debian-9-r1`, `0`, `0.2.1`, `0.2.1-r1`, `latest` (0/Dockerfile)](https://github.com/bitnami/bitnami-docker-metrics-server/blob/0.2.1-debian-9-r1/0/Dockerfile)
+* [`0-ol-7`, `0.2.1-ol-7-r2` (0/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-metrics-server/blob/0.2.1-ol-7-r2/0/ol-7/Dockerfile)
+* [`0-debian-9`, `0.2.1-debian-9-r2`, `0`, `0.2.1`, `0.2.1-r2`, `latest` (0/Dockerfile)](https://github.com/bitnami/bitnami-docker-metrics-server/blob/0.2.1-debian-9-r2/0/Dockerfile)
 * [`0-debian-8`, `0.2.1-debian-8-r2` (0/debian-8/Dockerfile)](https://github.com/bitnami/bitnami-docker-metrics-server/blob/0.2.1-debian-8-r2/0/debian-8/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/metrics-server GitHub repo](https://github.com/bitnami/bitnami-docker-metrics-server).