diff --git a/assets/nginx.conf b/assets/nginx.conf
index a9c7ff0..c3ec82d 100644
--- a/assets/nginx.conf
+++ b/assets/nginx.conf
@@ -2,6 +2,21 @@ server {
   listen 5005;
   
   
+  # Grafana
+  location /grafana/ {
+      proxy_pass http://grafana:3000/;
+      proxy_set_header Host $host;
+      proxy_set_header X-Real-IP $remote_addr;
+      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+      proxy_set_header X-Forwarded-Proto $scheme;
+
+      # Required for Grafana Live WebSocket connections
+      proxy_http_version 1.1;
+      proxy_set_header Upgrade $http_upgrade;
+      proxy_set_header Connection "upgrade";
+  }
+
+  
   location /collect {
     proxy_pass_request_headers on;
     proxy_pass_request_body on;
@@ -13,15 +28,6 @@ server {
   }
   
 
-  location /grafana {
-    proxy_pass_request_headers on;
-    proxy_pass_request_body on;
-    proxy_pass http://grafana:3000;
-    proxy_set_header Host $host;
-    proxy_set_header X-Real-IP $remote_addr;
-    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    proxy_set_header X-Forwarded-Proto $scheme;
-  }
 
   location / {
     root /usr/share/nginx/html/;
diff --git a/docker-compose-deploy.yaml b/docker-compose-deploy.yaml
index 0f52bb9..4cf5eeb 100644
--- a/docker-compose-deploy.yaml
+++ b/docker-compose-deploy.yaml
@@ -43,6 +43,12 @@ services:
     environment:
       GF_SECURITY_ADMIN_PASSWORD: "${GF_SECURITY_ADMIN_PASSWORD}"
       GF_SECURITY_ADMIN_USER: "${GF_SECURITY_ADMIN_USER}"
+      GF_SERVER_ROOT_URL: "http://${DOMAIN}/grafana/"
+      GF_SERVER_SERVE_FROM_SUB_PATH: "true"
+      # GF_SERVER_DOMAIN: ${DOMAIN}
+      # GF_SERVER_ENFORCE_DOMAIN: "false"
+      # GF_SERVER_HTTP_PORT: "3000"
+      # GF_SERVER_HTTP_ADDR: "0.0.0.0"
 
   loki:
     build: