diff --git a/docker-compose.yml b/docker-compose.yml
index d441fd9..405bcc1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -40,3 +40,17 @@ services:
       interval: 5s
       timeout: 5s
       retries: 20
+  rrdrest:
+    image: michaelwadman/rrdrest:latest
+    container_name: rrdrest
+    volumes:
+      - ./docker-persistence:/opt/librenms
+  grafana:
+    image: grafana/grafana-oss:latest
+    container_name: grafana
+    ports:
+      - "3445:3000"
+    environment:
+      - "GF_INSTALL_PLUGINS=marcusolsson-json-datasource"
+
+