diff --git a/jsonnet/kube-prometheus/kube-prometheus.libsonnet b/jsonnet/kube-prometheus/kube-prometheus.libsonnet
index 932eba85f0e43c96145791b8b140aa2d1c66ad32..c30f13f9f4b328829350b616ebdcfdf4aade499d 100644
--- a/jsonnet/kube-prometheus/kube-prometheus.libsonnet
+++ b/jsonnet/kube-prometheus/kube-prometheus.libsonnet
@@ -42,8 +42,12 @@ local configMapList = k.core.v1.configMapList;
   _config+:: {
     namespace: 'default',
 
+    versions+:: {
+      grafana: '6.0.0-beta1',
+    },
+
     tlsCipherSuites: [
-      'TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256',    // required by h2: http://golang.org/cl/30721
+      'TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256',  // required by h2: http://golang.org/cl/30721
       'TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256',  // required by h2: http://golang.org/cl/30721
 
       // 'TLS_RSA_WITH_RC4_128_SHA',            // insecure: https://access.redhat.com/security/cve/cve-2013-2566
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index f194ca86ebc9026aeefde41d0018da4746e166ae..a3561854a21496b060210d33266991315752ba71 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -8,7 +8,7 @@
                     "subdir": "contrib/kube-prometheus/jsonnet/kube-prometheus"
                 }
             },
-            "version": "f12ea289a1a99cf9fe433ec3a086d436baef6466"
+            "version": "6963b7410f28575a90a65c0aee1c79c8ef392fbb"
         },
         {
             "name": "ksonnet",
diff --git a/manifests/grafana-deployment.yaml b/manifests/grafana-deployment.yaml
index 60ffc3b482d4a8199098f0fd67d2d19bede5d37c..2caaca6d0fc7f23401da76f2ba2bd90dca8523dd 100644
--- a/manifests/grafana-deployment.yaml
+++ b/manifests/grafana-deployment.yaml
@@ -16,7 +16,7 @@ spec:
         app: grafana
     spec:
       containers:
-      - image: grafana/grafana:5.2.4
+      - image: grafana/grafana:6.0.0-beta1
         name: grafana
         ports:
         - containerPort: 3000