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)
diff --git a/docker/Dockerfile.grafana b/docker/Dockerfile.grafana
new file mode 100755
index 0000000..debed49
--- /dev/null
+++ b/docker/Dockerfile.grafana
@@ -0,0 +1,25 @@
+#!/usr/bin/env python
+#
+# Copyright 2016 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+FROM kamon/grafana_graphite
+
+MAINTAINER Sergio Slobodrian <sslobodr@ciena.com>
+
+# Update the configuration so grafana runs at a different root
+# everything else remains as defined in the kamon version
+
+RUN sed -i~ -e 's~;root_url.*~root_url = /grafana/~' /opt/grafana/conf/custom.ini
diff --git a/nginx_config/includes/grafana.conf b/nginx_config/includes/grafana.conf
new file mode 100644
index 0000000..93b7e68
--- /dev/null
+++ b/nginx_config/includes/grafana.conf
@@ -0,0 +1,6 @@
+location /grafana {
+  proxy_pass http://api-grafana;
+  rewrite /grafana(.*) /$1 break;
+  proxy_next_upstream error timeout invalid_header http_500;
+}
+
diff --git a/nginx_config/nginx-upstreams.ctmpl b/nginx_config/nginx-upstreams.ctmpl
index 188aa10..747e36b 100644
--- a/nginx_config/nginx-upstreams.ctmpl
+++ b/nginx_config/nginx-upstreams.ctmpl
@@ -1,3 +1,8 @@
+upstream api-grafana {
+    {{range service "grafana-web-ui" "any"}}
+    server {{.Address}}:{{.Port}};
+    {{end}}
+}
 upstream api-docker {
     {{range service "portainer" "any"}}
     server {{.Address}}:{{.Port}};