diff --git a/bitnami/grafana/6/ol-7/Dockerfile b/bitnami/grafana/6/ol-7/Dockerfile
index 4a590940f044..0e2c6d335b03 100644
--- a/bitnami/grafana/6/ol-7/Dockerfile
+++ b/bitnami/grafana/6/ol-7/Dockerfile
@@ -14,7 +14,7 @@ RUN mkdir -p /opt/bitnami/grafana/data/ /opt/bitnami/grafana/logs/ && chmod g+rw
 COPY rootfs /
 RUN /grafana-plugins.sh
 ENV BITNAMI_APP_NAME="grafana" \
-    BITNAMI_IMAGE_VERSION="6.5.1-ol-7-r7" \
+    BITNAMI_IMAGE_VERSION="6.5.1-ol-7-r8" \
     PATH="/opt/bitnami/grafana/bin:$PATH"
 
 EXPOSE 3000
diff --git a/bitnami/grafana/6/ol-7/docker-compose.yml b/bitnami/grafana/6/ol-7/docker-compose.yml
index 2d82d4752990..51a962713b0f 100644
--- a/bitnami/grafana/6/ol-7/docker-compose.yml
+++ b/bitnami/grafana/6/ol-7/docker-compose.yml
@@ -7,3 +7,8 @@ services:
       - '3000:3000'
     environment:
       - 'GF_SECURITY_ADMIN_PASSWORD=password'
+    volumes:
+      - grafana_data:/opt/bitnami/grafana/data
+volumes:
+  grafana_data:
+    driver: local
diff --git a/bitnami/grafana/README.md b/bitnami/grafana/README.md
index a5d5b6520984..8ecb4eeeb9c6 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.5.1-ol-7-r7` (6/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-grafana/blob/6.5.1-ol-7-r7/6/ol-7/Dockerfile)
+* [`6-ol-7`, `6.5.1-ol-7-r8` (6/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-grafana/blob/6.5.1-ol-7-r8/6/ol-7/Dockerfile)
 * [`6-debian-9`, `6.5.1-debian-9-r7`, `6`, `6.5.1`, `6.5.1-r7`, `latest` (6/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-grafana/blob/6.5.1-debian-9-r7/6/debian-9/Dockerfile)
 * [`6-photon-3`, `6.0.0-photon-3-r0` (6/photon-3/Dockerfile)](https://github.com/bitnami/bitnami-docker-grafana/blob/6.0.0-photon-3-r0/6/photon-3/Dockerfile)