diff --git a/docker-compose-lib.yaml b/docker-compose-lib.yaml
index 0f344c1bb..58750ce96 100644
--- a/docker-compose-lib.yaml
+++ b/docker-compose-lib.yaml
@@ -82,7 +82,13 @@ services:
     environment:
       - PGOPTIONS
       - MAPSERVER_CONFIG_FILE=/etc/mapserver/mapserver.conf
+<<<<<<< HEAD
       - MAPSERVER_BASE_PATH=/mapserv_proxy
+||||||| parent of 496a3a75 (continue)
+      - MAPSERVER_BASE_PATH=/mapserv_proxy/mapserver
+=======
+      - MAPSERVER_BASE_PATH=/mapserv_proxy/
+>>>>>>> 496a3a75 (continue)
       - OGCAPI_HTML_TEMPLATE_DIRECTORY=/usr/local/share/mapserver/ogcapi/templates/html-bootstrap4/
       - AWS_ACCESS_KEY_ID
       - AWS_SECRET_ACCESS_KEY
diff --git a/env.default b/env.default
index a8706b155..e5691af7b 100644
--- a/env.default
+++ b/env.default
@@ -44,7 +44,7 @@ TILECLOUDCHAIN_INTERNAL_URL=http://tilecloudchain:8080
 TILECLOUDCHAIN_INTERNAL_HOST=tilecloudchain
 TILECLOUDCHAIN_INTERNAL_PORT=8080
 # For internal print
-MAPSERVER_URL=http://mapserver:8080/
+MAPSERVER_URL=http://mapserver:8080/mapserv_proxy
 TINYOWS_URL=http://tinyows:8080/
 QGISSERVER_URL=http://qgisserver:8080/mapserv_proxy
 QGIS_VERSION=3.34-gdal3.8
diff --git a/ui/src/interfaces/ControllerDesktop.ts b/ui/src/interfaces/ControllerDesktop.ts
index ecabc54d4..911d5909e 100644
--- a/ui/src/interfaces/ControllerDesktop.ts
+++ b/ui/src/interfaces/ControllerDesktop.ts
@@ -66,12 +66,12 @@ class Controller extends AbstractDesktopController {
     //   console.log(features);
     // });
 
-    // MapServer route: /mapserv_proxy/mapserver/<ogc-server>/ogcapi/*
+    // MapServer route: /mapserv_proxy/<ogc-server>/ogcapi/*
     fetch(
-      'https://localhost:8484/mapserv_proxy/mapserver/<ogc-server>/ogcapi/collections/<layer>/items?bbox=6.0,46.0,7.0,47.0&limit=100&offset=0',
+      'https://localhost:8484/mapserv_proxy/<ogc-server>/ogcapi/collections/<layer>/items?bbox=6.0,46.0,7.0,47.0&limit=100&offset=0',
     );
     fetch(
-      'http://localhost:8090/mapserv_proxy/mapserver/MainPNG/ogcapi/collections/osm_open/items?bbox=6.0,46.0,7.0,47.0&limit=100&offset=0&ogcserver=MainPNG',
+      'http://localhost:8090/mapserv_proxy/MainPNG/ogcapi/collections/osm_open/items?bbox=6.0,46.0,7.0,47.0&limit=100&offset=0&ogcserver=MainPNG',
     );
 
     // QGISServer route: /mapserv_proxy/<ogc-server>/wfs3/*
@@ -79,7 +79,7 @@ class Controller extends AbstractDesktopController {
       'https://localhost:8484/mapserv_proxy/<ogc-server>/wfs3/collections/<layer-name/items?bbox=6.0,46.0,7.0,47.0&limit=100&offset=0',
     );
     fetch(
-      'http://localhost:8091/mapserv_proxy/wfs3/collections/points/items?bbox=6.0,46.0,7.0,47.0&limit=100&offset=0&map=/etc/qgisserver/project.qgs',
+      'http://localhost:8091/mapserv_proxy/wfs3/collections/points/items?bbox=6.0,46.0,7.0,47.0&limit=100&map=/etc/qgisserver/project.qgs',
     );
 
     //fetch(