diff --git a/pom.xml b/pom.xml
index 66b620b..d8387ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.gcube.common</groupId>
 	<artifactId>common-authorization</artifactId>
-	<version>2.1.4-SNAPSHOT</version>
+	<version>2.1.5-SNAPSHOT</version>
 	<name>authorization service common library</name>
 
 	<parent>
diff --git a/src/main/java/org/gcube/common/authorization/library/enpoints/AuthorizationEndpointScanner.java b/src/main/java/org/gcube/common/authorization/library/enpoints/AuthorizationEndpointScanner.java
index 9a2514c..70be1e1 100644
--- a/src/main/java/org/gcube/common/authorization/library/enpoints/AuthorizationEndpointScanner.java
+++ b/src/main/java/org/gcube/common/authorization/library/enpoints/AuthorizationEndpointScanner.java
@@ -34,7 +34,7 @@ public class AuthorizationEndpointScanner {
 
 		if (endpoints==null || endpoints.getEndpoints().size()==0){
 			log.trace("starting  authorization endpoint retrieving");
-			Map<Integer, AuthorizationEndpoint> endpointsMap = new HashMap<Integer, AuthorizationEndpoint>();
+			Map<String, AuthorizationEndpoint> endpointsMap = new HashMap<String, AuthorizationEndpoint>();
 			
 			try {
 
@@ -60,7 +60,7 @@ public class AuthorizationEndpointScanner {
 							defaultInfrastructure = endpoint.getInfrastructure();
 							defaultInfraPriority = endpoint.getPriority();
 						}
-						endpointsMap.put(endpoint.getInfrastructure().hashCode(), endpoint);
+						endpointsMap.put(endpoint.getInfrastructure(), endpoint);
 					}
 										
 					log.info("loaded endpoint {} ",endpoint.toString());
diff --git a/src/main/java/org/gcube/common/authorization/library/enpoints/EndpointsContainer.java b/src/main/java/org/gcube/common/authorization/library/enpoints/EndpointsContainer.java
index a7d7ec7..15fae84 100644
--- a/src/main/java/org/gcube/common/authorization/library/enpoints/EndpointsContainer.java
+++ b/src/main/java/org/gcube/common/authorization/library/enpoints/EndpointsContainer.java
@@ -4,15 +4,16 @@ import java.util.Map;
 
 public class EndpointsContainer {
 
-	private Map<Integer, AuthorizationEndpoint> endpoints;
+	private Map<String, AuthorizationEndpoint> endpoints;
 	private String defaultInfrastructure;
-	protected EndpointsContainer(Map<Integer, AuthorizationEndpoint> endpoints,
+	
+	protected EndpointsContainer(Map<String, AuthorizationEndpoint> endpoints,
 			String defaultInfrastructure) {
 		super();
 		this.endpoints = endpoints;
 		this.defaultInfrastructure = defaultInfrastructure;
 	}
-	public Map<Integer, AuthorizationEndpoint> getEndpoints() {
+	public Map<String, AuthorizationEndpoint> getEndpoints() {
 		return endpoints;
 	}
 	public String getDefaultInfrastructure() {
diff --git a/src/test/java/org/gcube/common/authorization/library/binder/EndpointBinder.java b/src/test/java/org/gcube/common/authorization/library/binder/EndpointBinder.java
index 0555cf9..ae6673e 100644
--- a/src/test/java/org/gcube/common/authorization/library/binder/EndpointBinder.java
+++ b/src/test/java/org/gcube/common/authorization/library/binder/EndpointBinder.java
@@ -59,7 +59,7 @@ public class EndpointBinder {
 	
 	@Test
 	public void scan(){
-		Map<Integer, AuthorizationEndpoint> endpoints = AuthorizationEndpointScanner.endpoints().getEndpoints();
+		Map<String, AuthorizationEndpoint> endpoints = AuthorizationEndpointScanner.endpoints().getEndpoints();
 		System.out.println(endpoints);
 	}