diff --git a/templates/components/grafana.jsonnet b/templates/components/grafana.jsonnet
index d9314a84..ca33e080 100644
--- a/templates/components/grafana.jsonnet
+++ b/templates/components/grafana.jsonnet
@@ -8,8 +8,9 @@ local images = import "values/images.jsonnet";
         create:: function(engine)
 
             local vol = engine.volume("prometheus-data").with_size("20G");
-            local cfgVol = engine.configVolume("./prometheus")
-                .with_size("20G");
+            local cfgVol = engine.configVolume(
+                "prometheus-cfg", "./prometheus"
+            );
 
             local container =
                 engine.container("prometheus")
@@ -18,8 +19,7 @@ local images = import "values/images.jsonnet";
                     .with_reservations("0.1", "128M")
                     .with_port(9090, 9090, "http")
                     .with_volume_mount(cfgVol, "/etc/prometheus")
-                    .with_volume_mount(vol, "/prometheus")
-;
+                    .with_volume_mount(vol, "/prometheus");
 
             local containerSet = engine.containers(
                 "prometheus", [ container ]
@@ -38,12 +38,15 @@ local images = import "values/images.jsonnet";
         create:: function(engine)
 
             local vol = engine.volume("grafana-storage").with_size("20G");
-            local cv1 = engine.configVolume("./grafana/dashboard.yml")
-                .with_size("20G");
-            local cv2 = engine.configVolume("./grafana/datasource.yml")
-                .with_size("20G");
-            local cv3 = engine.configVolume("./grafana/dashboard.json")
-                .with_size("20G");
+            local cv1 = engine.configVolume(
+                "dashboard-yml", "./grafana/dashboard.yml"
+            );
+            local cv2 = engine.configVolume(
+                "datasource-yml", "./grafana/datasource.yml"
+            );
+            local cv3 = engine.configVolume(
+                "dashboard-json", "./grafana/dashboard.json"
+            );
 
             local container =
                 engine.container("grafana")
@@ -58,11 +61,10 @@ local images = import "values/images.jsonnet";
                     .with_limits("1.0", "256M")
                     .with_reservations("0.5", "256M")
                     .with_port(3000, 3000, "cassandra")
-//                    .with_volume_mount(vol, "/var/lib/grafana")
-//                    .with_volume_mount(cv1, "/etc/grafana/provisioning/dashboards/dashboard.yml")
-//                    .with_volume_mount(cv2, "/etc/grafana/provisioning/datasources/datasource.yml")
-//                    .with_volume_mount(cv3, "/var/lib/grafana/dashboards/dashboard.json")
-;
+                    .with_volume_mount(vol, "/var/lib/grafana")
+                    .with_volume_mount(cv1, "/etc/grafana/provisioning/dashboards/dashboard.yml")
+                    .with_volume_mount(cv2, "/etc/grafana/provisioning/datasources/datasource.yml")
+                    .with_volume_mount(cv3, "/var/lib/grafana/dashboards/dashboard.json");
 
             local containerSet = engine.containers(
                 "grafana", [ container ]
diff --git a/templates/k8s.jsonnet b/templates/k8s.jsonnet
index facf3ce1..b5a72573 100644
--- a/templates/k8s.jsonnet
+++ b/templates/k8s.jsonnet
@@ -197,13 +197,13 @@
 
         volRef:: function() {
             name: volume.name,
-            persistentVolumeClaim: { name: volume.name },
+            persistentVolumeClaim: { name: volume.name + "-pvc" },
         }
 
     },
 
     // FIXME: For K8s
-    configVolume:: function(name)
+    configVolume:: function(name, dir)
     {
 
         local volume = self,
@@ -213,11 +213,24 @@
         with_size:: function(size) self + { size: size },
 
         add:: function() {
+            resources +: {
+                [volume.name + "-cm"]: {
+                    apiVersion: "v1",
+                    kind: "ConfigMap",
+                    metadata: {
+                        name: volume.name,
+                        namespace: "trustgraph",
+                    },
+                    data: {
+                        thing: "asldkajsdj"
+                    }
+                },
+            }
         },
 
         volRef:: function() {
             name: volume.name,
-            ASDpersistentVolumeClaim: { name: volume.name },
+            configMap: { name: volume.name + "-cm" },
         }
 
     },