diff --git a/compose/docker-compose-system-test.yml b/compose/docker-compose-system-test.yml
index a84b152..7f12258 100644
--- a/compose/docker-compose-system-test.yml
+++ b/compose/docker-compose-system-test.yml
@@ -75,7 +75,7 @@
   # (demo place-holder for external KPI system)
   #
   grafana:
-    image: kamon/grafana_graphite
+    image: voltha/grafana
     ports:
     - "8882:80"
     - "2003:2003"
@@ -88,6 +88,7 @@
       SERVICE_2004_NAME: "carbon-pickle-intake"
       SERVICE_8126_NAME: "statsd-tcp-intake"
       SERVICE_8125_NAME: "statsd-udp-intake"
+      GR_SERVER_ROOT_URL: "http://localhost:80/grafana/"
 
   #
   # Shovel (Kafka-graphite-gateway)