diff --git a/stable/grafana/Chart.yaml b/stable/grafana/Chart.yaml
index 87ec80fa50..a6a7924d33 100755
--- a/stable/grafana/Chart.yaml
+++ b/stable/grafana/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: grafana
-version: 2.3.4
+version: 2.3.5
 appVersion: 6.0.2
 kubeVersion: "^1.8.0-0"
 description: The leading tool for querying and visualizing time series and metrics.
diff --git a/stable/grafana/templates/dashboards-json-configmap.yaml b/stable/grafana/templates/dashboards-json-configmap.yaml
index bd46addcca..567da7f83f 100644
--- a/stable/grafana/templates/dashboards-json-configmap.yaml
+++ b/stable/grafana/templates/dashboards-json-configmap.yaml
@@ -15,9 +15,10 @@ metadata:
 data:
 {{- range $key, $value := $dashboards }}
 {{- if (or (hasKey $value "json") (hasKey $value "file")) }}
-{{ print $key | indent 2 }}.json: |-
+{{ print $key | indent 2 }}.json:
 {{- if hasKey $value "json" }}
-{{ $value.json | indent 4 }}
+    |-
+{{ $value.json | indent 6 }}
 {{- end }}
 {{- if hasKey $value "file" }}
 {{ toYaml ( $files.Get $value.file ) | indent 4}}