diff --git a/CHANGELOG.md b/CHANGELOG.md
index 46343fd..d3c2191 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 ## [v4.4.0] - 2021-04-12
 
-Removed home library dep, using shub for messaging
+- #21781, migrated to new AccessTokenProvider class
+
+- #21157, removed home library dep, using shub for messaging
 
 ## [v4.3.1] - 2021-02-02
 
diff --git a/pom.xml b/pom.xml
index 7a604d5..ec01252 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 	<groupId>org.gcube.portlets.admin</groupId>
 	<artifactId>vre-deploy</artifactId>
 	<packaging>war</packaging>
-	<version>4.4.0</version>
+	<version>4.4.0-SNAPSHOT</version>
 	<name>gCube VRE Deploy Wizard Portlet</name>
 	<description>
 		gCube VRE Deploy Wizard Portlet.
@@ -40,7 +40,7 @@
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
 				<artifactId>maven-portal-bom</artifactId>
-				<version>3.6.1</version>
+				<version>3.6.3-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -52,10 +52,7 @@
 			<artifactId>gwt-user</artifactId>
 			<scope>provided</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.gcube.common</groupId>
-			<artifactId>storagehub-client-library</artifactId>
-		</dependency>
+		
 		<dependency>
 			<groupId>org.gcube.applicationsupportlayer</groupId>
 			<artifactId>aslcore</artifactId>
@@ -84,7 +81,6 @@
 		<dependency>
 			<groupId>org.gcube.portal</groupId>
 			<artifactId>oidc-library-portal</artifactId>
-			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
diff --git a/src/main/java/org/gcube/portlets/admin/vredeployer/server/VREDeployerServiceImpl.java b/src/main/java/org/gcube/portlets/admin/vredeployer/server/VREDeployerServiceImpl.java
index 145ee8d..d920f55 100644
--- a/src/main/java/org/gcube/portlets/admin/vredeployer/server/VREDeployerServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/admin/vredeployer/server/VREDeployerServiceImpl.java
@@ -38,7 +38,7 @@ import org.gcube.applicationsupportlayer.social.NotificationsManager;
 import org.gcube.applicationsupportlayer.social.shared.SocialNetworkingSite;
 import org.gcube.applicationsupportlayer.social.shared.SocialNetworkingUser;
 import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
-import org.gcube.common.authorization.library.provider.UmaJWTProvider;
+import org.gcube.common.authorization.library.provider.AccessTokenProvider;
 import org.gcube.common.portal.PortalContext;
 import org.gcube.common.resources.gcore.GenericResource;
 import org.gcube.common.scope.api.ScopeProvider;
@@ -685,7 +685,7 @@ public class VREDeployerServiceImpl  extends RemoteServiceServlet implements Vre
 	private void createVRESharedGroupFolder(UserManager uMan, org.gcube.vomanagement.usermanagement.model.GCubeGroup vreCreated, String designer, String manager, String description) throws Exception {
 		GroupManager gm = new LiferayGroupManager();
 		String previousToken = SecurityTokenProvider.instance.get();
-		String previousUMAToken = UmaJWTProvider.instance.get();
+		String previousUMAToken = AccessTokenProvider.instance.get();
 		//get the super user
 		log.info("Getting super user with role {}", GatewayRolesNames.INFRASTRUCTURE_MANAGER.getRoleName());
 		//get the super user
@@ -725,7 +725,7 @@ public class VREDeployerServiceImpl  extends RemoteServiceServlet implements Vre
 
 		log.info("Created the VRE Folder on storageHub: {} ", vreFolderName);
 
-		UmaJWTProvider.instance.set(previousUMAToken);
+		AccessTokenProvider.instance.set(previousUMAToken);
 		SecurityTokenProvider.instance.set(previousToken);