diff --git a/src/main/java/org/gcube/common/authorization/client/proxy/AuthorizationProxy.java b/src/main/java/org/gcube/common/authorization/client/proxy/AuthorizationProxy.java
index cd76c31..df766a9 100644
--- a/src/main/java/org/gcube/common/authorization/client/proxy/AuthorizationProxy.java
+++ b/src/main/java/org/gcube/common/authorization/client/proxy/AuthorizationProxy.java
@@ -33,7 +33,7 @@ public interface AuthorizationProxy {
 	String generateUserToken(UserInfo client, String context)
 			throws Exception;
 
-	String requestActivation(ContainerInfo container, String context) throws Exception;
+	String requestActivation(ContainerInfo container) throws Exception;
 
 	public Map<String, String> retrieveApiKeys() throws Exception;
 	
diff --git a/src/main/java/org/gcube/common/authorization/client/proxy/DefaultAuthorizationProxy.java b/src/main/java/org/gcube/common/authorization/client/proxy/DefaultAuthorizationProxy.java
index 2d5ccec..e08ec51 100644
--- a/src/main/java/org/gcube/common/authorization/client/proxy/DefaultAuthorizationProxy.java
+++ b/src/main/java/org/gcube/common/authorization/client/proxy/DefaultAuthorizationProxy.java
@@ -186,14 +186,13 @@ public class DefaultAuthorizationProxy implements AuthorizationProxy {
 	
 	
 	@Override
-	public String requestActivation(ContainerInfo container, String context) throws Exception {
+	public String requestActivation(ContainerInfo container) throws Exception {
 		
 		String methodPath = "/token/node"; 
 				
-		int infrastructureHash = Utils.getInfrastructureHashfromContext(context);
+		int infrastructureHash = Utils.getInfrastructureHashFromToken(SecurityTokenProvider.instance.get(), endpoints.getDefaultInfrastructure());
 		StringBuilder callUrl = 
-				new StringBuilder(getInternalEnpoint(infrastructureHash)).append(methodPath).append("?")
-				.append(CONTEXT_PARAM).append("=").append(context);
+				new StringBuilder(getInternalEnpoint(infrastructureHash)).append(methodPath);
 					
 		URL url = new URL(callUrl.toString());
 		HttpURLConnection connection = makeRequest(url, "PUT", false);
diff --git a/src/test/java/org/gcube/common/authorizationservice/cl/CallTest.java b/src/test/java/org/gcube/common/authorizationservice/cl/CallTest.java
index ad6cf0c..5e4e9b9 100644
--- a/src/test/java/org/gcube/common/authorizationservice/cl/CallTest.java
+++ b/src/test/java/org/gcube/common/authorizationservice/cl/CallTest.java
@@ -25,7 +25,8 @@ public class CallTest {
 	
 	@Test
 	public void requestNodeToken()  throws Exception {
-		String token = authorizationService().requestActivation(new ContainerInfo("node11.d.d4science.research-infrastructures.eu",8080), "/gcube/devNext/NextNext");
+		SecurityTokenProvider.instance.set(requestTestToken("/gcube/devNext/NextNext"));
+		String token = authorizationService().requestActivation(new ContainerInfo("node11.d.d4science.research-infrastructures.eu",8080));
 		System.out.println(token);
 	}