diff --git a/CHANGELOG.md b/CHANGELOG.md
index 505f243..ff5967c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 ## [v2.1.0-SNAPSHOT]
 
 - Aligned model with the model defined in Luca Frosini PhD dissertation [#20367]
-
+- Added support for context names included in header among UUIDs [#22090]
 
 ## [v2.0.0]
 
diff --git a/src/main/java/org/gcube/smartgears/handler/resourceregistry/EServiceHandler.java b/src/main/java/org/gcube/smartgears/handler/resourceregistry/EServiceHandler.java
index 352957e..5bfd03a 100644
--- a/src/main/java/org/gcube/smartgears/handler/resourceregistry/EServiceHandler.java
+++ b/src/main/java/org/gcube/smartgears/handler/resourceregistry/EServiceHandler.java
@@ -123,7 +123,7 @@ public class EServiceHandler extends ApplicationLifecycleHandler {
 				}
 			}
 			
-			Set<UUID> resourceContextsUUID = eServiceManager.getContextsUUID();
+			Set<UUID> resourceContextsUUID = eServiceManager.getContextsUUID().keySet();
 			removeResourceFromOldContexts(startContextsUUID, resourceContextsUUID);
 			
 		} catch (Throwable e) {
diff --git a/src/main/java/org/gcube/smartgears/handler/resourceregistry/HostingNodeHandler.java b/src/main/java/org/gcube/smartgears/handler/resourceregistry/HostingNodeHandler.java
index ca11f5f..f788c5c 100644
--- a/src/main/java/org/gcube/smartgears/handler/resourceregistry/HostingNodeHandler.java
+++ b/src/main/java/org/gcube/smartgears/handler/resourceregistry/HostingNodeHandler.java
@@ -126,7 +126,7 @@ public class HostingNodeHandler extends ContainerHandler {
 				}
 			}
 			
-			Set<UUID> resourceContextsUUID = hostingNodeManager.getContextsUUID();
+			Set<UUID> resourceContextsUUID = hostingNodeManager.getContextsUUID().keySet();
 			removeResourceFromOldContexts(startContextsUUID, resourceContextsUUID);
 			
 		} catch (Throwable e) {
diff --git a/src/main/java/org/gcube/smartgears/handler/resourceregistry/resourcemanager/EServiceManager.java b/src/main/java/org/gcube/smartgears/handler/resourceregistry/resourcemanager/EServiceManager.java
index 8df571d..148fbd0 100644
--- a/src/main/java/org/gcube/smartgears/handler/resourceregistry/resourcemanager/EServiceManager.java
+++ b/src/main/java/org/gcube/smartgears/handler/resourceregistry/resourcemanager/EServiceManager.java
@@ -3,7 +3,7 @@ package org.gcube.smartgears.handler.resourceregistry.resourcemanager;
 import java.net.URI;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Set;
+import java.util.Map;
 import java.util.UUID;
 
 import javax.servlet.ServletRegistration;
@@ -277,7 +277,7 @@ public class EServiceManager {
 		}
 	}
 
-	public Set<UUID> getContextsUUID() throws Exception {
+	public Map<UUID,String> getContextsUUID() throws Exception {
 		return resourceRegistryPublisher.getResourceContexts(eService);
 	}
 
diff --git a/src/main/java/org/gcube/smartgears/handler/resourceregistry/resourcemanager/HostingNodeManager.java b/src/main/java/org/gcube/smartgears/handler/resourceregistry/resourcemanager/HostingNodeManager.java
index c4fff0f..f0e58ee 100644
--- a/src/main/java/org/gcube/smartgears/handler/resourceregistry/resourcemanager/HostingNodeManager.java
+++ b/src/main/java/org/gcube/smartgears/handler/resourceregistry/resourcemanager/HostingNodeManager.java
@@ -16,7 +16,6 @@ import java.util.Calendar;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.UUID;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -623,7 +622,7 @@ public class HostingNodeManager {
 		return cpuFacets;
 	}
 
-	public Set<UUID> getContextsUUID() throws Exception {
+	public Map<UUID,String> getContextsUUID() throws Exception {
 		return resourceRegistryPublisher.getResourceContexts(hostingNode);
 	}