diff --git a/pom.xml b/pom.xml
index d2722ce..2010bcc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,11 +46,6 @@
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.gcube.common</groupId>
-			<artifactId>authorization-utils</artifactId>
-			<version>[2.0.0, 3.0.0-SNAPSHOT)</version>
-		</dependency>
 		<!-- Test Dependencies -->
 		<dependency>
 			<groupId>junit</groupId>
@@ -63,5 +58,11 @@
 			<artifactId>logback-classic</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.gcube.common</groupId>
+			<artifactId>authorization-utils</artifactId>
+			<version>[2.1.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/rest/ServiceInstance.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/rest/ServiceInstance.java
index 26ea4fd..3288d87 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/rest/ServiceInstance.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/rest/ServiceInstance.java
@@ -1,6 +1,6 @@
 package org.gcube.informationsystem.resourceregistry.api.rest;
 
-import org.gcube.common.authorization.utils.manager.SecretManagerProvider;
+import org.gcube.common.scope.api.ScopeProvider;
 
 /**
  * @author Luca Frosini (ISTI - CNR)
@@ -12,7 +12,7 @@ public abstract class ServiceInstance {
 	public static final String BASE_URL = "https://url.d4science.org";
 	
 	public static String getCurrentContextFullName() {
-		String context = SecretManagerProvider.instance.get().getContext();
+		String context = ScopeProvider.instance.get();
 		return context;
 	}