diff --git a/bitnami/grafana/6/ol-7/Dockerfile b/bitnami/grafana/6/ol-7/Dockerfile
index 41338847b6c2..4ceec01e79ca 100644
--- a/bitnami/grafana/6/ol-7/Dockerfile
+++ b/bitnami/grafana/6/ol-7/Dockerfile
@@ -1,4 +1,4 @@
-FROM bitnami/oraclelinux-extras:7-r395
+FROM bitnami/oraclelinux-extras:7-r396
 LABEL maintainer "Bitnami <containers@bitnami.com>"
 
 # Install required system packages and dependencies
@@ -12,7 +12,7 @@ RUN mkdir -p /opt/bitnami/grafana/data/ /opt/bitnami/grafana/logs/ && chmod g+rw
 
 COPY rootfs /
 ENV BITNAMI_APP_NAME="grafana" \
-    BITNAMI_IMAGE_VERSION="6.2.5-ol-7-r17" \
+    BITNAMI_IMAGE_VERSION="6.2.5-ol-7-r18" \
     PATH="/opt/bitnami/grafana/bin:$PATH"
 
 EXPOSE 3000
diff --git a/bitnami/grafana/README.md b/bitnami/grafana/README.md
index f786ee79a085..b5d34413ce1d 100644
--- a/bitnami/grafana/README.md
+++ b/bitnami/grafana/README.md
@@ -46,7 +46,7 @@ $ kubectl apply -f test.yaml
 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/).
 
 
-* [`6-ol-7`, `6.2.5-ol-7-r17` (6/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-grafana/blob/6.2.5-ol-7-r17/6/ol-7/Dockerfile)
+* [`6-ol-7`, `6.2.5-ol-7-r18` (6/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-grafana/blob/6.2.5-ol-7-r18/6/ol-7/Dockerfile)
 * [`6-debian-9`, `6.2.5-debian-9-r18`, `6`, `6.2.5`, `6.2.5-r18`, `latest` (6/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-grafana/blob/6.2.5-debian-9-r18/6/debian-9/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/grafana GitHub repo](https://github.com/bitnami/bitnami-docker-grafana).