diff --git a/config-ui/nginx.conf b/config-ui/nginx.conf
index 6e2b7f84d60..f37b79213a6 100644
--- a/config-ui/nginx.conf
+++ b/config-ui/nginx.conf
@@ -52,7 +52,6 @@ ${SERVER_CONF}
     resolver ${DNS} valid=${DNS_VALID};
     resolver_timeout 3s;
     set $target "${GRAFANA_ENDPOINT}";
-    rewrite /grafana/(.*) /$1  break;
     proxy_set_header Host $http_host;
     proxy_set_header Authorization "";
     proxy_set_header X-Forwarded-Access-Token "${cookie_access_token}";
diff --git a/grafana/Dockerfile b/grafana/Dockerfile
index 9d62a2168a0..d3b321aac62 100644
--- a/grafana/Dockerfile
+++ b/grafana/Dockerfile
@@ -30,6 +30,7 @@ COPY ./dashboards /etc/grafana/dashboards
 COPY ./img/grafana_icon.svg /usr/share/grafana/public/img/grafana_icon.svg
 COPY ./img /usr/share/grafana/public/img/lake
 ENV GF_USERS_ALLOW_SIGN_UP=false
+ENV GF_SERVER_SERVE_FROM_SUB_PATH=true
 ENV GF_DASHBOARDS_JSON_ENABLED=true
 ENV GF_LIVE_ALLOWED_ORIGINS='*'
 ENV GF_DASHBOARDS_DEFAULT_HOME_DASHBOARD_PATH=/etc/grafana/dashboards/Homepage.json