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}};