diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index db0b615..487c553 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-                                                                                                                                                                                                                                                                                                                                                                        
+                                                                                                                                                                                                                                                                                                                                                                            
+    
     
     
     
@@ -89,7 +90,8 @@
     
     
     <wb-module deploy-name="gcube-ckan-datacatalog-2.3.1">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
+        
         
         
         
@@ -179,7 +181,8 @@
         
         
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
+        
         
         
         
@@ -269,7 +272,8 @@
         
         
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
+        
         
         
         
@@ -359,7 +363,8 @@
         
         
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-                                                                                                                                                
+                                                                                                                                                        
+        
         
         
         
@@ -383,7 +388,8 @@
         <dependent-module archiveName="ckan-metadata-publisher-widget-2.3.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/ckan-metadata-publisher-widget/ckan-metadata-publisher-widget">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
+        
         
         
         
@@ -473,7 +479,8 @@
         
         
         <property name="context-root" value="gcube-ckan-datacatalog"/>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
+        
         
         
         
@@ -563,7 +570,8 @@
         
         
         <property name="java-output-path" value="/gcube-ckan-datacatalog/target/gcube-ckan-datacatalog-1.0.0-SNAPSHOT/WEB-INF/classes"/>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
+    
     
     
     
@@ -653,7 +661,8 @@
     
     
     </wb-module>
-                                                                                                                                                                                                                                                                                                                                                                    
+                                                                                                                                                                                                                                                                                                                                                                        
+
 
 
 
diff --git a/pom.xml b/pom.xml
index 9f78fae..08c8830 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,7 @@
 				</property>
 			</activation>
 			<properties>
-				<gcube-portal-bom-version>3.7.0</gcube-portal-bom-version>
+				<maven-portal-bom-version>3.7.0</maven-portal-bom-version>
 			</properties>
 		</profile>
 		<!-- DEV profile -->
@@ -58,7 +58,7 @@
 				</property>
 			</activation>
 			<properties>
-				<gcube-portal-bom-version>3.8.0-SNAPSHOT</gcube-portal-bom-version>
+				<maven-portal-bom-version>4.0.0-SNAPSHOT</maven-portal-bom-version>
 			</properties>
 		</profile>
 	</profiles>
@@ -68,7 +68,7 @@
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
 				<artifactId>maven-portal-bom</artifactId>
-				<version>${gcube-portal-bom-version}</version>
+				<version>${maven-portal-bom-version}</version>
 				<type>pom</type>
 				<scope>import</scope>
 				<exclusions>