diff --git a/pom.xml b/pom.xml
index e4d1e2f..1d9c575 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>org.gcube.distribution</groupId>
 	<artifactId>gcube-portal-bundle</artifactId>
-	<version>4.7.0-SNAPSHOT</version>
+	<version>5.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<scm>
 		<connection>scm:git:https://code-repo.d4science.org/gCubeSystem/gcube-portal-bundle.git</connection>
@@ -21,7 +21,7 @@
 	<inceptionYear>2016</inceptionYear>
 	<developers>
 		<developer>
-			<id>@maxassante</id>
+			<id>massimiliano.assante</id>
 			<name>Massimiliano Assante</name>
 		</developer>
 	</developers>
@@ -31,27 +31,29 @@
 		<!-- 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>640SNAPSHOT</resourceManagementVersionLayout>
+<!-- 		<gcubeLoggedinVersionLayout>320SNAPSHOT</gcubeLoggedinVersionLayout> -->
+<!-- 		<usersManagementVersionLayout>340SNAPSHOT</usersManagementVersionLayout> -->
+<!-- 		<rolesManagementVersionLayout>300SNAPSHOT</rolesManagementVersionLayout> -->
+<!-- 		<addUsersVersionLayout>221SNAPSHOT</addUsersVersionLayout> -->
+<!-- 		<resourceManagementVersionLayout>700SNAPSHOT</resourceManagementVersionLayout> -->
 
-		<!-- <gcubeLoggedinVersionLayout>320440</gcubeLoggedinVersionLayout> -->
-		<!-- <usersManagementVersionLayout>340440</usersManagementVersionLayout> -->
-		<!-- <rolesManagementVersionLayout>300420</rolesManagementVersionLayout> -->
-		<!-- <addUsersVersionLayout>221440</addUsersVersionLayout> -->
-		<!-- <resourceManagementVersionLayout>630440</resourceManagementVersionLayout> -->
+		<gcubeLoggedinVersionLayout>320440</gcubeLoggedinVersionLayout>
+		<usersManagementVersionLayout>3814150</usersManagementVersionLayout>
+		<rolesManagementVersionLayout>300420</rolesManagementVersionLayout>
+		<addUsersVersionLayout>221430</addUsersVersionLayout>
+		<resourceManagementVersionLayout>700</resourceManagementVersionLayout>
 
-		<asl-artifactsid>aslcore,aslsocial,accesslogger</asl-artifactsid>
+		<asl-artifactsid>aslcore,aslsocial</asl-artifactsid>
 		<fws-artifactsid>common-clients,common-configuration-scanner,common-fw-clients,common-gcore-resources,
 			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</fws-artifactsid>
+			accounting-lib,threadlocal-vars-cleaner,common-generic-clients,
+			event-publisher-library,event-publisher-portal,oidc-library,oidc-library-portal</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,service-endpoint-editor</ep-artifactsid>
-		<custom-plugins-artifactsid>gcube-responsive-theme,session-timeout-hook</custom-plugins-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>
 		<staging-plugins-artifactsid>portal-staging,portal-auth-library</staging-plugins-artifactsid>
 	</properties>
 	<build>
@@ -263,7 +265,7 @@
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
 				<artifactId>maven-portal-bom</artifactId>
-				<version>3.6.0</version>
+				<version>3.6.0-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -282,6 +284,12 @@
 			<scope>provided</scope>
 		</dependency>
 		<!-- Custom Portal Plugins -->
+		<dependency>
+			<groupId>org.gcube.portal.liferay</groupId>
+			<artifactId>user-registration-hook</artifactId>
+			<version>[2.0.2-SNAPSHOT,)</version>
+			<type>war</type>
+		</dependency>
 		<dependency>
 			<groupId>org.gcube.portal.plugins</groupId>
 			<artifactId>social-dockbar-hook</artifactId>
@@ -306,12 +314,12 @@
 			<version>[6.3.0-SNAPSHOT,)</version>
 			<type>war</type>
 		</dependency>
-		<!-- <dependency> -->
-		<!-- <groupId>org.gcube.portal.plugins</groupId> -->
-		<!-- <artifactId>VREFolder-hook</artifactId> -->
-		<!-- <version>[6.3.0-SNAPSHOT,)</version> -->
-		<!-- <type>war</type> -->
-		<!-- </dependency> -->
+		<dependency>
+			<groupId>org.gcube.portal.plugins</groupId>
+			<artifactId>VREFolder-hook</artifactId>
+			<version>[6.7.0-SNAPSHOT,)</version>
+			<type>war</type>
+		</dependency>
 		<dependency>
 			<groupId>org.gcube.portal</groupId>
 			<artifactId>portal-staging</artifactId>
@@ -322,6 +330,39 @@
 			<groupId>org.gcube.portal.auth</groupId>
 			<artifactId>portal-auth-library</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.gcube.portal</groupId>
+			<artifactId>oidc-enrollment-hook</artifactId>
+			<version>[1.1.0-SNAPSHOT,)</version>
+			<type>war</type>
+		</dependency>
+		<dependency>
+			<groupId>org.gcube.portal</groupId>
+			<artifactId>event-publisher-hook</artifactId>
+			<version>[1.0.0-SNAPSHOT,)</version>
+			<type>war</type>
+		</dependency>
+		<!-- Keycloak and orchestrator libs -->
+		<dependency>
+			<groupId>org.gcube.common</groupId>
+			<artifactId>event-publisher-library</artifactId>
+			<version>[1.0.0-SNAPSHOT,)</version>
+		</dependency>
+		<dependency>
+			<groupId>org.gcube.portal</groupId>
+			<artifactId>event-publisher-portal</artifactId>
+			<version>[1.0.1-SNAPSHOT,)</version>
+		</dependency>
+		<dependency>
+			<groupId>org.gcube.common</groupId>
+			<artifactId>oidc-library</artifactId>
+			<version>[1.1.0-SNAPSHOT,)</version>
+		</dependency>
+		<dependency>
+			<groupId>org.gcube.portal</groupId>
+			<artifactId>oidc-library-portal</artifactId>
+			<version>[1.1.0-SNAPSHOT,)</version>
+		</dependency>
 		<!-- Enabling Portlets & Plugins -->
 		<dependency>
 			<groupId>org.gcube.portlets.user</groupId>
@@ -349,8 +390,8 @@
 		</dependency>
 		<dependency>
 			<groupId>org.gcube.portlets.admin</groupId>
-			<artifactId>resource-management</artifactId>
-			<version>[6.3.0-SNAPSHOT,)</version>
+			<artifactId>resource-management-portlet</artifactId>
+			<version>[7.0.0-SNAPSHOT,)</version>
 			<type>war</type>
 		</dependency>
 		<dependency>
@@ -385,7 +426,7 @@
 		<dependency>
 			<groupId>org.gcube.portal</groupId>
 			<artifactId>threadlocal-vars-cleaner</artifactId>
-			<version>[2.1.0-SNAPSHOT,)</version>
+			<version>[2.2.1-SNAPSHOT,)</version>
 		</dependency>
 		<dependency>
 			<groupId>org.gcube.common</groupId>