diff --git a/gateway/docker-compose.yml b/gateway/docker-compose.yml
index d4ce6a2bd..955b4c1a0 100644
--- a/gateway/docker-compose.yml
+++ b/gateway/docker-compose.yml
@@ -7,6 +7,7 @@ services:
       - GATEWAY_PORT=80
       - JWT_SHARED_KEY=${JWT_SHARED_KEY}
       - AGENTS_API_URL=${AGENTS_API_URL:-http://agents-api-multi-tenant:8080}
+      - MONITOR_URL=${MONITOR_URL:-http://grafana:3000}
       - AGENTS_API_KEY=${AGENTS_API_KEY}
       - AGENTS_API_KEY_HEADER_NAME=${AGENTS_API_KEY_HEADER_NAME:-Authorization}
       - TRAEFIK_LOG_LEVEL=${TRAEFIK_LOG_LEVEL:-INFO}
diff --git a/gateway/traefik.yml.template b/gateway/traefik.yml.template
index 4ab3b4367..cd3a6c6c6 100644
--- a/gateway/traefik.yml.template
+++ b/gateway/traefik.yml.template
@@ -29,6 +29,15 @@ http:
       service: service-agents-api
       priority: 1
     
+    agents-monitor:
+      entryPoints:
+        - web
+      rule: Path(`/monitor{path:.*}`)
+      middlewares:
+        - corsHeaders
+      service: service-monitor
+      priority: 1
+    
     agents-api-docs:
       entryPoints:
         - web
@@ -99,7 +108,13 @@ http:
         passHostHeader: false
         servers:
           - url: $AGENTS_API_URL
-          
+
+    service-monitor:
+      loadBalancer:
+        passHostHeader: false
+        servers:
+          - url: $MONITOR_URL
+
 experimental:
   localPlugins:
     jwt:
diff --git a/grafana/docker-compose.yml b/grafana/docker-compose.yml
index 86723774c..02162a406 100644
--- a/grafana/docker-compose.yml
+++ b/grafana/docker-compose.yml
@@ -6,6 +6,8 @@ services:
     environment:
       - GF_SECURITY_ADMIN_PASSWORD=${GRAFANA_ADMIN_PASSWORD}
       - GF_SECURITY_ADMIN_USER=${GRAFANA_ADMIN_USER}
+      - GF_SERVER_ROOT_URL=%(protocol)s://%(domain)s:%(http_port)s/monitor/
+      - GF_SERVER_SERVE_FROM_SUB_PATH=true
     container_name: grafana
     ports:
       - 3000:3000