diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
index 49425c5fd..b493d80d5 100644
--- a/docker/docker-compose.yaml
+++ b/docker/docker-compose.yaml
@@ -186,7 +186,7 @@ services:
     env_file:
       - ${ENV_FILE:-../.env}
     environment:
-      OPENISLE_MCP_BACKEND_BASE_URL: ${OPENISLE_MCP_BACKEND_BASE_URL:-http://springboot:8080}
+      OPENISLE_MCP_BACKEND_BASE_URL: http://springboot:${SERVER_PORT:-8080}
       OPENISLE_MCP_HOST: 0.0.0.0
       OPENISLE_MCP_PORT: ${OPENISLE_MCP_PORT:-8085}
       OPENISLE_MCP_TRANSPORT: ${OPENISLE_MCP_TRANSPORT:-streamable-http}
diff --git a/nginx/openisle b/nginx/openisle
index fb523acdc..9a6d063c8 100644
--- a/nginx/openisle
+++ b/nginx/openisle
@@ -120,8 +120,8 @@ server {
         add_header         Cache-Control "no-store" always;
     }
 
-    location ^~ /mcp/ {
-        proxy_pass         http://127.0.0.1:8085/;
+    location /mcp {
+        proxy_pass         http://127.0.0.1:8085;
         proxy_http_version 1.1;
 
         proxy_set_header   Upgrade              $http_upgrade;
diff --git a/nginx/openisle-staging b/nginx/openisle-staging
index ef5d014c9..0c10f0e5a 100644
--- a/nginx/openisle-staging
+++ b/nginx/openisle-staging
@@ -42,8 +42,8 @@ server {
         proxy_pass http://127.0.0.1:8081/api/;
         proxy_http_version 1.1;
 
-    	proxy_set_header Upgrade $http_upgrade;
-    	proxy_set_header Connection $connection_upgrade;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection $connection_upgrade;
 
 
         proxy_set_header Host              $host;
@@ -59,7 +59,7 @@ server {
         proxy_no_cache 1;
         proxy_cache_bypass 1;
     }
-    
+
     location ^~ /websocket/ {
         proxy_pass         http://127.0.0.1:8083/;
         proxy_http_version 1.1;
@@ -80,8 +80,8 @@ server {
         add_header         Cache-Control "no-store" always;
     }
 
-    location ^~ /mcp/ {
-        proxy_pass         http://127.0.0.1:8086/;
+    location /mcp {
+        proxy_pass         http://127.0.0.1:8086;
         proxy_http_version 1.1;
 
         proxy_set_header   Upgrade              $http_upgrade;
@@ -100,4 +100,4 @@ server {
         add_header         Cache-Control "no-store" always;
     }
 
-}
+}
\ No newline at end of file