diff --git a/grafana/dashboard.json b/grafana/dashboards/dashboard.json
similarity index 100%
rename from grafana/dashboard.json
rename to grafana/dashboards/dashboard.json
diff --git a/grafana/dashboard.yml b/grafana/provisioning/dashboard.yml
similarity index 100%
rename from grafana/dashboard.yml
rename to grafana/provisioning/dashboard.yml
diff --git a/grafana/datasource.yml b/grafana/provisioning/datasource.yml
similarity index 100%
rename from grafana/datasource.yml
rename to grafana/provisioning/datasource.yml
diff --git a/templates/components/grafana.jsonnet b/templates/components/grafana.jsonnet
index 6b1c4742..81364f72 100644
--- a/templates/components/grafana.jsonnet
+++ b/templates/components/grafana.jsonnet
@@ -44,17 +44,20 @@ local images = import "values/images.jsonnet";
             local vol = engine.volume("grafana-storage").with_size("20G");
 
             local provVol = engine.configVolume(
-                "provisioning", "./grafana/",
+                "provisioning", "./grafana/provisioning/",
 		{
-		    "dashboard.yml": importstr "grafana/dashboard.yml",
-		    "datasource.yml": importstr "grafana/datasource.yml",
+		    "dashboard.yml":
+                        importstr "grafana/provisioning/dashboard.yml",
+		    "datasource.yml":
+                        importstr "grafana/provisioning/datasource.yml",
 		}
 		
             );
             local dashVol = engine.configVolume(
-                "dashboards", "./grafana/",
+                "dashboards", "./grafana/dashboards/",
 		{
-		    "dashboard.json": importstr "grafana/dashboard.json",
+		    "dashboard.json":
+                        importstr "grafana/dashboards/dashboard.json",
 		}
 		
             );
@@ -73,8 +76,12 @@ local images = import "values/images.jsonnet";
                     .with_reservations("0.5", "256M")
                     .with_port(3000, 3000, "cassandra")
                     .with_volume_mount(vol, "/var/lib/grafana")
-                    .with_volume_mount(provVol, "/etc/grafana/provisioning/dashboards/")
-                    .with_volume_mount(dashVol, "/etc/grafana/provisioning/dash/");
+                    .with_volume_mount(
+                        provVol, "/etc/grafana/provisioning/dashboards/"
+                    )
+                    .with_volume_mount(
+                        dashVol, "/var/lib/grafana/dashboards/"
+                    );
 
             local containerSet = engine.containers(
                 "grafana", [ container ]