diff --git a/CHANGELOG.md b/CHANGELOG.md
index a3ccad3..44d60a3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,53 +4,34 @@
 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).
 
-## [v5.0.2-SNAPSHOT] - 2021-05-25
+## [v5.0.2-SNAPSHOT] - 2021-06-24
 
-Added support for authorization common AccessToken provider
+- Added support for authorization common AccessToken provider and common-gcube-calls in CP
 
 ## [v5.0.1] - 2021-03-25
 
-Added support for new Accounting libs
+- Added support for new Accounting libs
 
 ## [v5.0.0] - 2020-11-16
 
-Added support for keycloak as IAM
+- Added support for keycloak as IAM
 
 ## [v4.6.0] - 2018-06-19
 
-Added Storage hub dependency
+- Added Storage hub dependency
 
 ## [v4.3.0] - 2017-01-06
 
-Removed dismissed ASL Components, added portal auth library dependency
+- Removed dismissed ASL Components, added portal auth library dependency
 
 ## [v3.6.0] - 2015-10-06
 
-Updated themes, added bootstrap support
+- Updated themes, added bootstrap support
 
 ## [v3.3.0] - 2014-10-27
 
-Updated themes for hashtag support, Updated dockbar for hashtag support
+- Updated themes for hashtag support, Updated dockbar for hashtag support
 
 ## [v3.0.0] - 2014-06-12
 
-gCube gCore Free Portal first release
-
-<ReleaseNotes>	
-	<Changeset component="org.gcube.portal.portal-bundle.4-6-0" date="2018-06-19">
-		<Change>Added Storage hub dependency</Change>
-	</Changeset>
-	<Changeset component="org.gcube.portal.portal-bundle.4-3-0" date="2017-01-06">
-		<Change>Removed dismissed ASL Components, added portal auth library dependency</Change>
-	</Changeset>
-	<Changeset component="org.gcube.portal.portal-bundle.3-6-0" date="2015-10-06">
-		<Change>Updated themes, added bootstrap support</Change>
-	</Changeset>
-	<Changeset component="org.gcube.portal.portal-bundle.3-3-0" date="2014-10-27">
-		<Change>Updated themes for hashtag support</Change>
-		<Change>Updated dockbar for hashtag support</Change>
-	</Changeset>
-	<Changeset component="org.gcube.portal.portal-bundle.3-0-0" date="2014-06-12">
-		<Change>gCube gCore Free Portal first release</Change>
-	</Changeset>
-</ReleaseNotes>
\ No newline at end of file
+- gCube gCore Free Portal first release
\ No newline at end of file
diff --git a/distro/changelog.xml b/distro/changelog.xml
deleted file mode 100644
index fdbc0d1..0000000
--- a/distro/changelog.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<ReleaseNotes>	
-	<Changeset component="org.gcube.portal.portal-bundle.4-6-0" date="2018-06-19">
-		<Change>Added Storage hub dependency</Change>
-	</Changeset>
-	<Changeset component="org.gcube.portal.portal-bundle.4-3-0" date="2017-01-06">
-		<Change>Removed dismissed ASL Components, added portal auth library dependency</Change>
-	</Changeset>
-	<Changeset component="org.gcube.portal.portal-bundle.3-6-0" date="2015-10-06">
-		<Change>Updated themes, added bootstrap support</Change>
-	</Changeset>
-	<Changeset component="org.gcube.portal.portal-bundle.3-3-0" date="2014-10-27">
-		<Change>Updated themes for hashtag support</Change>
-		<Change>Updated dockbar for hashtag support</Change>
-	</Changeset>
-	<Changeset component="org.gcube.portal.portal-bundle.3-0-0" date="2014-06-12">
-		<Change>gCube gCore Free Portal first release</Change>
-	</Changeset>
-</ReleaseNotes>
\ No newline at end of file
diff --git a/distro/descriptor.xml b/distro/descriptor.xml
deleted file mode 100644
index a01bf47..0000000
--- a/distro/descriptor.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<assembly
-	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-	<id>portal</id>
-	<formats>
-		<format>tar.gz</format>
-	</formats>
-	<baseDirectory>/</baseDirectory>
-	<fileSets>
-		<fileSet>
-			<directory>${distroDirectory}</directory>
-			<outputDirectory>/META-INF</outputDirectory>
-			<useDefaultExcludes>true</useDefaultExcludes>
-			<includes>
-				<include>README</include>
-				<include>LICENSE</include>
-				<include>changelog.xml</include>
-			</includes>
-			<fileMode>755</fileMode>
-			<filtered>true</filtered>
-		</fileSet>		
-		<fileSet>
-			<directory>Portal-Bundle</directory>
-			<outputDirectory>/</outputDirectory>
-			<useDefaultExcludes>true</useDefaultExcludes>
-			<fileMode>755</fileMode>
-		</fileSet>
-	</fileSets>
-</assembly>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 8bd62cb..b8bf96e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,15 +27,14 @@
 	</developers>
 	<properties>
 		<tomcat.version>7.0.62</tomcat.version>
-		<distroDirectory>distro</distroDirectory>
 		<!-- As long as we do not automatize this make sure the version correspond 
 			with the enabling portlets one -->
 
-<!-- 		<gcubeLoggedinVersionLayout>320SNAPSHOT</gcubeLoggedinVersionLayout> -->
-<!-- 		<usersManagementVersionLayout>340SNAPSHOT</usersManagementVersionLayout> -->
-<!-- 		<rolesManagementVersionLayout>300SNAPSHOT</rolesManagementVersionLayout> -->
-<!-- 		<addUsersVersionLayout>221SNAPSHOT</addUsersVersionLayout> -->
-<!-- 		<resourceManagementVersionLayout>700SNAPSHOT</resourceManagementVersionLayout> -->
+		<!-- <gcubeLoggedinVersionLayout>320SNAPSHOT</gcubeLoggedinVersionLayout> -->
+		<!-- <usersManagementVersionLayout>340SNAPSHOT</usersManagementVersionLayout> -->
+		<!-- <rolesManagementVersionLayout>300SNAPSHOT</rolesManagementVersionLayout> -->
+		<!-- <addUsersVersionLayout>221SNAPSHOT</addUsersVersionLayout> -->
+		<!-- <resourceManagementVersionLayout>700SNAPSHOT</resourceManagementVersionLayout> -->
 
 		<gcubeLoggedinVersionLayout>320440</gcubeLoggedinVersionLayout>
 		<usersManagementVersionLayout>3814150</usersManagementVersionLayout>
@@ -48,12 +47,12 @@
 			common-gcore-stubs,common-scope,common-scope-maps,common-uri,discovery-client,ic-client,
 			registry-publisher,common-authorization,authorization-client,document-store-lib,
 			accounting-lib,threadlocal-vars-cleaner,common-generic-clients,
-			event-publisher-library,event-publisher-portal,oidc-library,oidc-library-portal</fws-artifactsid>
+			event-publisher-library,event-publisher-portal,oidc-library,oidc-library-portal,common-gcube-calls</fws-artifactsid>
 		<hl-artifactsid>home-library,home-library-model,home-library-jcr,jackrabbit-jcr-commons,jackrabbit-jcr-rmi-custom,jcr</hl-artifactsid>
 		<snl-artifactsid>social-networking-library,notifications-common-library,tour-manager</snl-artifactsid>
 		<ep-artifactsid>gcube-login-portlet,gcube-loggedin,UsersManagementPortlet,register-vre-users,resource-management-portlet,service-endpoint-editor</ep-artifactsid>
 		<custom-plugins-artifactsid>gcube-responsive-theme,session-timeout-hook,
-		oidc-enrollment-hook,event-publisher-hook,VREFolder-hook,user-registration-hook</custom-plugins-artifactsid>
+			oidc-enrollment-hook,event-publisher-hook,VREFolder-hook,user-registration-hook</custom-plugins-artifactsid>
 		<staging-plugins-artifactsid>portal-staging,portal-auth-library</staging-plugins-artifactsid>
 	</properties>
 	<build>
@@ -239,25 +238,6 @@
 					</replacements>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<configuration>
-					<appendAssemblyId>false</appendAssemblyId>
-					<descriptors>
-						<descriptor>distro/descriptor.xml</descriptor>
-					</descriptors>
-				</configuration>
-				<executions>
-					<execution>
-						<id>portal</id>
-						<phase>package</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
 		</plugins>
 	</build>
 	<dependencyManagement>
@@ -265,7 +245,7 @@
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
 				<artifactId>maven-portal-bom</artifactId>
-				<version>3.6.2-SNAPSHOT</version>
+				<version>3.6.3-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -287,7 +267,7 @@
 		<dependency>
 			<groupId>org.gcube.portal.liferay</groupId>
 			<artifactId>user-registration-hook</artifactId>
-			<version>[2.0.2-SNAPSHOT,)</version>
+			<version>[2.0.4-SNAPSHOT,)</version>
 			<type>war</type>
 		</dependency>
 		<dependency>
@@ -317,7 +297,7 @@
 		<dependency>
 			<groupId>org.gcube.portal.plugins</groupId>
 			<artifactId>VREFolder-hook</artifactId>
-			<version>[6.7.0-SNAPSHOT,)</version>
+			<version>[6.8.2-SNAPSHOT,)</version>
 			<type>war</type>
 		</dependency>
 		<dependency>
@@ -434,6 +414,11 @@
 			<artifactId>common-authorization</artifactId>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.gcube.core</groupId>
+			<artifactId>common-gcube-calls</artifactId>
+			<scope>provided</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.gcube.core</groupId>
 			<artifactId>common-clients</artifactId>