diff --git a/bitnami/grafana/Chart.yaml b/bitnami/grafana/Chart.yaml
index e4ad19c7e..7fa926ea2 100644
--- a/bitnami/grafana/Chart.yaml
+++ b/bitnami/grafana/Chart.yaml
@@ -1,7 +1,7 @@
 annotations:
   category: Analytics
 apiVersion: v2
-appVersion: 7.5.7
+appVersion: 7.5.8
 dependencies:
   - name: common
     repository: https://charts.bitnami.com/bitnami
@@ -24,4 +24,4 @@ name: grafana
 sources:
   - https://github.com/bitnami/bitnami-docker-grafana
   - https://grafana.com/
-version: 5.2.17
+version: 5.2.18
diff --git a/bitnami/grafana/values.yaml b/bitnami/grafana/values.yaml
index c8b829ef5..e62da4f3d 100644
--- a/bitnami/grafana/values.yaml
+++ b/bitnami/grafana/values.yaml
@@ -14,7 +14,7 @@
 image:
   registry: docker.io
   repository: bitnami/grafana
-  tag: 7.5.7-debian-10-r5
+  tag: 7.5.8-debian-10-r0
   ## Specify a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
   ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -496,7 +496,7 @@ imageRenderer:
   image:
     registry: docker.io
     repository: bitnami/grafana-image-renderer
-    tag: 2.1.1-debian-10-r6
+    tag: 2.1.1-debian-10-r25
     ## Specify a imagePullPolicy
     ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
     ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images