diff --git a/.classpath b/.classpath
index 5f217a5..c5eb1df 100644
--- a/.classpath
+++ b/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry excluding="**" kind="src" output="target/workspace-6.28.4-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
+	<classpathentry excluding="**" kind="src" output="target/workspace-6.28.4/WEB-INF/classes" path="src/main/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
@@ -22,7 +22,7 @@
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" output="target/workspace-6.28.4-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/workspace-6.28.4/WEB-INF/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
@@ -35,5 +35,5 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="output" path="target/workspace-6.28.4-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/workspace-6.28.4/WEB-INF/classes"/>
 </classpath>
diff --git a/.settings/com.gwtplugins.gdt.eclipse.core.prefs b/.settings/com.gwtplugins.gdt.eclipse.core.prefs
index 5806c97..5f13c9f 100644
--- a/.settings/com.gwtplugins.gdt.eclipse.core.prefs
+++ b/.settings/com.gwtplugins.gdt.eclipse.core.prefs
@@ -1,4 +1,4 @@
 eclipse.preferences.version=1
-lastWarOutDir=/home/francescomangiacrapa/git/workspace/target/workspace-6.28.4-SNAPSHOT
+lastWarOutDir=/home/francescomangiacrapa/git/workspace/target/workspace-6.28.4
 warSrcDir=src/main/webapp
 warSrcDirIsOutput=false
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 74ab9ff..3e5485a 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-                                                                                                                                                                                          
+                                                                                                                                                                                                  
     
     
     
@@ -45,8 +45,12 @@
     
     
     
-    <wb-module deploy-name="workspace-6.28.4-SNAPSHOT">
-                                                                                                                                                                                                                                                                                                                                                                                        
+    
+    
+    <wb-module deploy-name="workspace-6.28.4">
+                                                                                                                                                                                                                                                                                                                                                                                                        
+        
+        
         
         
         
@@ -93,7 +97,9 @@
         
         
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
-                                                                                                                                                                                                                                                                                                                                                                                    
+                                                                                                                                                                                                                                                                                                                                                                                                    
+        
+        
         
         
         
@@ -140,7 +146,9 @@
         
         
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
-                                                                                                                                                                                                                                                                                                                                                                                        
+                                                                                                                                                                                                                                                                                                                                                                                                        
+        
+        
         
         
         
@@ -187,7 +195,9 @@
         
         
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-sources/gwt"/>
-                                                                                                                                                                                                                                                                                                                                                                                
+                                                                                                                                                                                                                                                                                                                                                                                                
+        
+        
         
         
         
@@ -233,7 +243,9 @@
         
         
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-                                                                                                                
+                                                                                                                                
+        
+        
         
         
         
@@ -247,7 +259,12 @@
         
         
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-                                                                                                                                                                                                                                                                                                                                                                                    
+        <dependent-module archiveName="workspace-tree-widget-6.35.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/WorkspaceTree/WorkspaceTree">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+                                                                                                                                                                                                                                                                                                                                                                                                    
+        
+        
         
         
         
@@ -294,7 +311,9 @@
         
         
         <property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
-                                                                                                                                                                                                                                                                                                                                                                                        
+                                                                                                                                                                                                                                                                                                                                                                                                        
+        
+        
         
         
         
@@ -341,7 +360,9 @@
         
         
         <property name="context-root" value="workspace"/>
-                                                                                                                                                                                                                                                                                                                                                                                  
+                                                                                                                                                                                                                                                                                                                                                                                                  
+    
+    
     
     
     
@@ -388,7 +409,9 @@
     
     
     </wb-module>
-                                                                                                                                                                                        
+                                                                                                                                                                                                
+
+
 
 
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 996e3ee..6c05ca3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [v6.28.5-SNAPSHOT] - 2022-06-27
+
+- [#23523] Updated to maven-portal-bom 3.6.4
+
 ## [v6.28.4] - 2022-06-14
 
 - [#23491] Just to release the Publishing Widget enhancement #23491
diff --git a/pom.xml b/pom.xml
index ffb77b7..e2bde1d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 	<groupId>org.gcube.portlets.user</groupId>
 	<artifactId>workspace</artifactId>
 	<packaging>war</packaging>
-	<version>6.28.4</version>
+	<version>6.28.5-SNAPSHOT</version>
 	<name>gCube Workspace Portlet</name>
 	<description>
 		gCube Workspace Portlet is a web-gui to manage the gCube workspace, a collaborative area where users can exchange and organize information objects (workspace items) according to their specific needs. 
@@ -46,7 +46,7 @@
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
 				<artifactId>maven-portal-bom</artifactId>
-				<version>3.6.3</version>
+				<version>3.6.4</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -55,16 +55,6 @@
 
 	<dependencies>
 
-		<!-- UNCOMMENT THIS TO RUN IN DEVO MODE -->
-		<!-- <dependency> -->
-		<!-- <groupId>xerces</groupId> -->
-		<!-- <artifactId>xerces</artifactId> -->
-		<!-- <version>2.4.0</version> -->
-		<!-- </dependency> -->
-
-		<!-- This dependency is needed and is need on TOP to use GWT UI BInder 
-			without old Xerces version of gCore complaining -->
-
 		<dependency>
 			<groupId>com.google.gwt</groupId>
 			<artifactId>gwt-user</artifactId>
@@ -91,6 +81,7 @@
 			<version>2.9.1</version>
 			<scope>provided</scope>
 		</dependency>
+
 		<dependency>
 			<groupId>org.gcube.common</groupId>
 			<artifactId>authorization-client</artifactId>