diff --git a/build/devServer.js b/build/devServer.js
index 12468e5058..429fd889f0 100644
--- a/build/devServer.js
+++ b/build/devServer.js
@@ -3,40 +3,41 @@ const protocol = process.env.MAPSTORE_BACKEND_PROTOCOL || "http";
 const host = process.env.MAPSTORE_BACKEND_HOST || "localhost";
 const MAPSTORE_BACKEND_BASE_URL = process.env.MAPSTORE_BACKEND_BASE_URL || (protocol + "://" + host + ":" + port);
 const MAPSTORE_BACKEND_BASE_PATH = process.env.MAPSTORE_BACKEND_BASE_PATH || "/mapstore";
-var matches = MAPSTORE_BACKEND_BASE_URL.match(/^https?\:\/\/([^\/?#]+)(?:[\/?#]|$)/i);
+const MAPSTORE_BACKEND_URL = process.env.MAPSTORE_BACKEND_URL || MAPSTORE_BACKEND_BASE_URL + MAPSTORE_BACKEND_BASE_PATH;
+var matches = MAPSTORE_BACKEND_URL.match(/^https?\:\/\/([^\/?#]+)(?:[\/?#]|$)/i);
 var domain = matches && matches[1];
 // configuration for local dev server. This is used by webpack-dev-server
 // to proxy requests to the backend.
 const devServer = {
     proxy: {
         '/rest': {
-            target: `${MAPSTORE_BACKEND_BASE_URL}${MAPSTORE_BACKEND_BASE_PATH}`,
+            target: MAPSTORE_BACKEND_URL,
             secure: false,
             logLevel: "debug"
         },
         '/pdf': {
-            target: `${MAPSTORE_BACKEND_BASE_URL}${MAPSTORE_BACKEND_BASE_PATH}`,
+            target: MAPSTORE_BACKEND_URL,
             secure: false,
             headers: {
                 host: domain
             }
         },
         '/proxy': {
-            target: `${MAPSTORE_BACKEND_BASE_URL}${MAPSTORE_BACKEND_BASE_PATH}`,
+            target: MAPSTORE_BACKEND_URL,
             secure: false,
             headers: {
                 host: domain
             }
         },
         '/extensions.json': {
-            target: `${MAPSTORE_BACKEND_BASE_URL}${MAPSTORE_BACKEND_BASE_PATH}`,
+            target: MAPSTORE_BACKEND_URL,
             secure: false,
             headers: {
                 host: domain
             }
         },
         '/dist/extensions': {
-            target: `${MAPSTORE_BACKEND_BASE_URL}${MAPSTORE_BACKEND_BASE_PATH}`,
+            target: MAPSTORE_BACKEND_URL,
             secure: false,
             headers: {
                 host: domain
diff --git a/docs/developer-guide/developing.md b/docs/developer-guide/developing.md
index 081b96179f..6bb00e6700 100644
--- a/docs/developer-guide/developing.md
+++ b/docs/developer-guide/developing.md
@@ -44,10 +44,10 @@ See the [dedicated section in this page](#backend) for more info
 You can run only the front-end running `npm run fe:start`.
 Running this script MapStore will run on port `8081` and will look for the back-end at port `8080`.
 
-If you want to use an online instance of MapStore as backend, instead of the local one, you can define the environment variable `MAPSTORE_BACKEND_BASE_URL` to the desired URL.
+If you want to use an online instance of MapStore as backend, instead of the local one, you can define the environment variable `MAPSTORE_BACKEND_URL` to the desired URL.
 
 ```sh
-export MAPSTORE_BACKEND_BASE_URL=https://demo.geo-solutions.it/mapstore
+export MAPSTORE_BACKEND_URL=https://dev-mapstore.geosolutionsgroup.com/mapstore
 npm run fe:start # this command lunches only the front-end
 ```
 
diff --git a/product/pom.xml b/product/pom.xml
index 2ac560dd14..3d52da10b9 100644
--- a/product/pom.xml
+++ b/product/pom.xml
@@ -274,6 +274,10 @@
                     <properties>
                         <cargo.servlet.port>${tomcat.port}</cargo.servlet.port>
                         <cargo.logging>low</cargo.logging>
+<!-- setting javax.xml.parsers.SAXParserFactory is a workaround for issue https://github.com/geosolutions-it/geostore/issues/311 and can be removed when solved -->
+                        <cargo.jvmargs>
+                            -Djavax.xml.parsers.SAXParserFactory="com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl"
+                        </cargo.jvmargs>
                     </properties>
                 </configuration>
                 <deployables>