diff --git a/tools/graphite/docker-compose.yml b/tools/graphite/docker-compose.yml
new file mode 100644
index 000000000..108b36be3
--- /dev/null
+++ b/tools/graphite/docker-compose.yml
@@ -0,0 +1,15 @@
+version: '2'
+services:
+    grafana:
+        image: grafana/grafana
+        depends_on:
+            - graphite
+        links:
+            - graphite
+        ports:
+            - "3000:3000"
+    graphite:
+        image: sitespeedio/graphite
+        ports:
+            - "2003:2003"
+            - "8080:80"
diff --git a/tools/docker-compose.yml b/tools/influxdb/docker-compose.yml
similarity index 75%
rename from tools/docker-compose.yml
rename to tools/influxdb/docker-compose.yml
index f5f4667dd..b41032922 100644
--- a/tools/docker-compose.yml
+++ b/tools/influxdb/docker-compose.yml
@@ -3,18 +3,11 @@ services:
     grafana:
         image: grafana/grafana
         depends_on:
-            - graphite
             - influxdb
         links:
-            - graphite
             - influxdb
         ports:
             - "3000:3000"
-    graphite:
-        image: sitespeedio/graphite
-        ports:
-            - "2003:2003"
-            - "8080:80"
     influxdb:
         image: tutum/influxdb
         environment: