diff --git a/.classpath b/.classpath
index 3bdd95d..3ccf7fb 100644
--- a/.classpath
+++ b/.classpath
@@ -36,8 +36,8 @@
 	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
 		<attributes>
-			<attribute name="test" value="true"/>
 			<attribute name="optional" value="true"/>
+			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 202a458..05307a1 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -1,7 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+            
+    
     <wb-module deploy-name="workspace-tree-widget">
+                        
+        
         <wb-resource deploy-path="/" source-path="/src/main/java"/>
+                        
+        
         <wb-resource deploy-path="/" source-path="/src/main/resources"/>
+                
         <wb-resource deploy-path="/" source-path="/target/generated-sources/annotations"/>
+                    
+    
     </wb-module>
+        
+
 </project-modules>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a2a357b..260d589 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@ 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.32.0-SNAPSHOT] - 2021-02-22
+
+#### Enhancements
+
+[#20762] Moved to ckan-metadata-publisher-widget 2.X
+
 ## [v6.31.3] - 2021-03-25
 
 #### Bug Fixes
diff --git a/pom.xml b/pom.xml
index 6ed3611..0d170c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 
 	<groupId>org.gcube.portlets.user</groupId>
 	<artifactId>workspace-tree-widget</artifactId>
-	<version>6.31.3</version>
+	<version>6.32.0-SNAPSHOT</version>
 	<name>gCube Workspace Tree Widget</name>
 	<description>
 		gCube Workspace Tree Widget is a widget to navigate and interact with gCube Workspace 
@@ -247,7 +247,7 @@
 		<dependency>
 			<groupId>org.gcube.portlets.widgets</groupId>
 			<artifactId>ckan-metadata-publisher-widget</artifactId>
-			<version>[1.0.0,2.0.0-SNAPSHOT)</version>
+			<version>[2.0.0-SNAPSHOT, 3.0.0)</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/AppControllerExplorer.java b/src/main/java/org/gcube/portlets/user/workspace/client/AppControllerExplorer.java
index 72a5d34..3a1b324 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/client/AppControllerExplorer.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/client/AppControllerExplorer.java
@@ -174,6 +174,7 @@ import com.github.gwtbootstrap.client.ui.Modal;
 import com.github.gwtbootstrap.client.ui.event.HideEvent;
 import com.github.gwtbootstrap.client.ui.event.HideHandler;
 import com.google.gwt.core.client.GWT;
+import com.google.gwt.dom.client.Element;
 import com.google.gwt.event.shared.EventHandler;
 import com.google.gwt.event.shared.HandlerManager;
 import com.google.gwt.http.client.RequestBuilder;
@@ -311,7 +312,7 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt
 					modal.setTitle("Publish Item");
 					modal.addStyleName("insert-metadata-modal-style");
 					modal.addStyleName("modal-top-custom");
-					// ((Element)modal.getElement().getChildNodes().getItem(1)).addClassName("modal-body-custom");
+					((Element)modal.getElement().getChildNodes().getItem(1)).addClassName("modal-body-ws-tree ");
 					modal.add(new CreateDatasetForm(folderId, eventBus));
 					modal.setCloseVisible(true);
 					modal.show();
diff --git a/src/main/java/org/gcube/portlets/user/workspace/public/workspacetree.css b/src/main/java/org/gcube/portlets/user/workspace/public/workspacetree.css
index 685444e..ff08273 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/public/workspacetree.css
+++ b/src/main/java/org/gcube/portlets/user/workspace/public/workspacetree.css
@@ -264,9 +264,8 @@ table.userssuggest th {
 	margin-left: -600px !important;
 }
 
-.modal-body-custom {
-	height: 550px !important;
-	max-height: none !important;
+.modal-body-ws-tree {
+	max-height: 700px !important;
 }
 
 .modal-top-custom {