diff --git a/bitnami/grafana/5/ol-7/Dockerfile b/bitnami/grafana/5/ol-7/Dockerfile
index 1efd6f68410b..c8b6d0d04452 100644
--- a/bitnami/grafana/5/ol-7/Dockerfile
+++ b/bitnami/grafana/5/ol-7/Dockerfile
@@ -1,22 +1,24 @@
-FROM bitnami/oraclelinux-extras:7-r26 as buildenv
+FROM bitnami/oraclelinux-extras:7-r33 as buildenv
 
-RUN install_packages ca-certificates wget
-RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/grafana-5.2.1-0-linux-x64-debian-8.tar.gz && \
-    echo "c9991da9d1dc48ddbad16302c92fa9a95b9267c1e90945439b9783477ede606c  /tmp/bitnami/pkg/cache/grafana-5.2.1-0-linux-x64-debian-8.tar.gz" | sha256sum -c - && \
-    tar -zxf /tmp/bitnami/pkg/cache/grafana-5.2.1-0-linux-x64-debian-8.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \
-    rm -rf /tmp/bitnami/pkg/cache/grafana-5.2.1-0-linux-x64-debian-8.tar.gz
+RUN install_packages ca-certificates libfontconfig wget
+RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/grafana-5.2.1-5-linux-x64-debian-8.tar.gz && \
+    echo "9188ab38a5e229253daecf43fa4ef5143ba95fcf95686f73e9718571e80e3a44  /tmp/bitnami/pkg/cache/grafana-5.2.1-5-linux-x64-debian-8.tar.gz" | sha256sum -c - && \
+    tar -zxf /tmp/bitnami/pkg/cache/grafana-5.2.1-5-linux-x64-debian-8.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \
+    rm -rf /tmp/bitnami/pkg/cache/grafana-5.2.1-5-linux-x64-debian-8.tar.gz
+RUN mv /opt/bitnami/grafana/conf/sample.ini /opt/bitnami/grafana/conf/grafana.ini
 RUN mkdir -p /opt/bitnami/grafana/data/ /opt/bitnami/grafana/logs/ && chmod g+rwX /opt/bitnami/grafana/data/ /opt/bitnami/grafana/logs/
 
 ##################
 
-FROM bitnami/oraclelinux-extras:7-r26
+FROM bitnami/oraclelinux-extras:7-r33
 LABEL maintainer "Bitnami <containers@bitnami.com>"
 
 COPY --from=buildenv /opt/bitnami/grafana /opt/bitnami/grafana
 ENV BITNAMI_APP_NAME="grafana" \
-    BITNAMI_IMAGE_VERSION="5.2.1-ol-7-r6" \
+    BITNAMI_IMAGE_VERSION="5.2.1-ol-7-r7" \
     PATH="/opt/bitnami/grafana/bin:$PATH"
 
+RUN install_packages curl
 RUN install_packages fontconfig ca-certificates
 
 EXPOSE 3000
diff --git a/bitnami/grafana/README.md b/bitnami/grafana/README.md
index eec4c561ef1c..17acd4017d63 100644
--- a/bitnami/grafana/README.md
+++ b/bitnami/grafana/README.md
@@ -22,7 +22,7 @@ $ docker run --name grafana bitnami/grafana:latest
 
 # Supported tags and respective `Dockerfile` links
 
-* [`5-ol-7`, `5.2.1-ol-7-r6` (5/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-grafana/blob/5.2.1-ol-7-r6/5/ol-7/Dockerfile)
+* [`5-ol-7`, `5.2.1-ol-7-r7` (5/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-grafana/blob/5.2.1-ol-7-r7/5/ol-7/Dockerfile)
 * [`5-debian-9`, `5.2.1-debian-9-r1`, `5`, `5.2.1`, `5.2.1-r1`, `latest` (5/Dockerfile)](https://github.com/bitnami/bitnami-docker-grafana/blob/5.2.1-debian-9-r1/5/Dockerfile)
 * [`5-debian-8`, `5.2.1-debian-8-r9` (5/debian-8/Dockerfile)](https://github.com/bitnami/bitnami-docker-grafana/blob/5.2.1-debian-8-r9/5/debian-8/Dockerfile)