diff --git a/stable/grafana/Chart.yaml b/stable/grafana/Chart.yaml
index eeb8c646f6..a6c25fa958 100644
--- a/stable/grafana/Chart.yaml
+++ b/stable/grafana/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: grafana
-version: 5.0.16
+version: 5.0.18
 appVersion: 6.7.3
 kubeVersion: "^1.8.0-0"
 description: The leading tool for querying and visualizing time series and metrics.
diff --git a/stable/grafana/templates/_pod.tpl b/stable/grafana/templates/_pod.tpl
index 5b4e6f2ec0..61cd6ee33b 100644
--- a/stable/grafana/templates/_pod.tpl
+++ b/stable/grafana/templates/_pod.tpl
@@ -202,6 +202,7 @@ containers:
       - name: {{ .name }}
         mountPath: {{ .mountPath }}
         readOnly: {{ .readOnly }}
+        subPath: {{ .subPath | default "" }}
     {{- end }}
     {{- range .Values.extraVolumeMounts }}
       - name: {{ .name }}
diff --git a/stable/grafana/values.yaml b/stable/grafana/values.yaml
index 6f32d00507..54789493aa 100644
--- a/stable/grafana/values.yaml
+++ b/stable/grafana/values.yaml
@@ -281,6 +281,7 @@ extraSecretMounts: []
   #   mountPath: /etc/secrets
   #   secretName: grafana-secret-files
   #   readOnly: true
+  #   subPath: ""
 
 ## Additional grafana server volume mounts
 # Defines additional volume mounts.