diff --git a/pom.xml b/pom.xml
index 5732798..f83b168 100644
--- a/pom.xml
+++ b/pom.xml
@@ -156,6 +156,10 @@
 			<groupId>org.gcube.common</groupId>
 			<artifactId>gxHTTP</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.gcube.common</groupId>
+			<artifactId>keycloak-client</artifactId>
+		</dependency>
 
 		<dependency>
 			<groupId>org.gcube.core</groupId>
diff --git a/src/main/java/org/gcube/gcat/utils/Constants.java b/src/main/java/org/gcube/gcat/utils/Constants.java
index 0d16eac..98ee410 100644
--- a/src/main/java/org/gcube/gcat/utils/Constants.java
+++ b/src/main/java/org/gcube/gcat/utils/Constants.java
@@ -55,9 +55,9 @@ public class Constants {
 	}
 	
 	private static TokenResponse getJWTAccessToken() throws Exception {
-		String contextToAuthorise = SecretManagerProvider.instance.get().getContext();
-		Entry<String,String> entry = getClientIdAndClientSecret(contextToAuthorise);
-		TokenResponse tr = KeycloakClientFactory.newInstance().queryUMAToken(contextToAuthorise, entry.getKey(), entry.getValue(), null, null);
+		String context = SecretManagerProvider.instance.get().getContext();
+		Entry<String,String> entry = getClientIdAndClientSecret(context);
+		TokenResponse tr = KeycloakClientFactory.newInstance().queryUMAToken(context, entry.getKey(), entry.getValue(), context, null);
 	    return tr;
 	}