diff --git a/.gitmodules b/.gitmodules
index 00da0a732e..6a8c7e327b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "geonode_mapstore_client/client/MapStore2"]
 	path = geonode_mapstore_client/client/MapStore2
 	url = https://github.com/geosolutions-it/MapStore2.git
-	branch = master
+	branch = 2024.02.xx
diff --git a/geonode_mapstore_client/client/.npmrc b/geonode_mapstore_client/client/.npmrc
index 9ad2cab2f4..1b94ce162b 100644
--- a/geonode_mapstore_client/client/.npmrc
+++ b/geonode_mapstore_client/client/.npmrc
@@ -1,4 +1,2 @@
 # add legacy peer dependency flag on npm install
 legacy-peer-deps=true
-# this is needed for node greater then 16
-node-options=--openssl-legacy-provider
diff --git a/geonode_mapstore_client/client/MapStore2 b/geonode_mapstore_client/client/MapStore2
index e9d340998d..49ba8e8e81 160000
--- a/geonode_mapstore_client/client/MapStore2
+++ b/geonode_mapstore_client/client/MapStore2
@@ -1 +1 @@
-Subproject commit e9d340998d3472e1a7bdfef109e7de82a5730e24
+Subproject commit 49ba8e8e81694c0e23f18bccf97aa3ca79beddab
diff --git a/geonode_mapstore_client/client/package.json b/geonode_mapstore_client/client/package.json
index 55a8527e17..a50b9a73e4 100644
--- a/geonode_mapstore_client/client/package.json
+++ b/geonode_mapstore_client/client/package.json
@@ -26,7 +26,7 @@
   "author": "GeoSolutions",
   "license": "BSD-2-Clause",
   "devDependencies": {
-    "@mapstore/project": "1.0.27",
+    "@mapstore/project": "git+https://github.com/geosolutions-it/mapstore-project.git#2024.02.xx",
     "dotenv": "10.0.0",
     "jsdoc": "4.0.0"
   },
@@ -35,7 +35,8 @@
     "dompurify": "2.5.4",
     "mapstore": "file:MapStore2",
     "react-helmet": "6.1.0",
-    "react-intl": "2.3.0"
+    "react-intl": "2.3.0",
+    "react-router-dom": "4.1.1"
   },
   "mapstore": {
     "output": "dist",