diff --git a/src/main/java/org/gcube/smartgears/connector/resourceregistry/resourcemanager/EServiceManager.java b/src/main/java/org/gcube/smartgears/connector/resourceregistry/resourcemanager/EServiceManager.java
index 164e46f..0f30570 100644
--- a/src/main/java/org/gcube/smartgears/connector/resourceregistry/resourcemanager/EServiceManager.java
+++ b/src/main/java/org/gcube/smartgears/connector/resourceregistry/resourcemanager/EServiceManager.java
@@ -33,7 +33,6 @@ import org.gcube.informationsystem.resourceregistry.client.ResourceRegistryClien
 import org.gcube.informationsystem.resourceregistry.publisher.ResourceRegistryPublisher;
 import org.gcube.informationsystem.resourceregistry.publisher.ResourceRegistryPublisherFactory;
 import org.gcube.informationsystem.serialization.ElementMapper;
-import org.gcube.informationsystem.utils.UUIDManager;
 import org.gcube.resourcemanagement.model.impl.entities.facets.AccessPointFacetImpl;
 import org.gcube.resourcemanagement.model.impl.entities.facets.EventFacetImpl;
 import org.gcube.resourcemanagement.model.impl.entities.facets.SoftwareFacetImpl;
@@ -227,7 +226,7 @@ public class EServiceManager {
 		ApplicationConfiguration applicationConfiguration = applicationContext.configuration();
 		String id = applicationContext.id();
 
-		UUID uuid = UUIDManager.getInstance().generateValidRandomUUID();
+		UUID uuid = UUID.fromString(id);
 		EService eService = new EServiceImpl();
 		eService.setUUID(uuid);
 
diff --git a/src/main/java/org/gcube/smartgears/connector/resourceregistry/resourcemanager/HostingNodeManager.java b/src/main/java/org/gcube/smartgears/connector/resourceregistry/resourcemanager/HostingNodeManager.java
index 6103fd2..a6b3caf 100644
--- a/src/main/java/org/gcube/smartgears/connector/resourceregistry/resourcemanager/HostingNodeManager.java
+++ b/src/main/java/org/gcube/smartgears/connector/resourceregistry/resourcemanager/HostingNodeManager.java
@@ -49,7 +49,6 @@ import org.gcube.informationsystem.resourceregistry.client.ResourceRegistryClien
 import org.gcube.informationsystem.resourceregistry.publisher.ResourceRegistryPublisher;
 import org.gcube.informationsystem.resourceregistry.publisher.ResourceRegistryPublisherFactory;
 import org.gcube.informationsystem.serialization.ElementMapper;
-import org.gcube.informationsystem.utils.UUIDManager;
 import org.gcube.resourcemanagement.model.impl.entities.facets.CPUFacetImpl;
 import org.gcube.resourcemanagement.model.impl.entities.facets.EventFacetImpl;
 import org.gcube.resourcemanagement.model.impl.entities.facets.LocationFacetImpl;
@@ -294,7 +293,7 @@ public class HostingNodeManager {
 		ContainerConfiguration containerConfiguration = containerContext.configuration();
 		String id = containerContext.id();
 
-		UUID uuid = UUIDManager.getInstance().generateValidRandomUUID();
+		UUID uuid = UUID.fromString(id);
 		HostingNode hostingNode = new HostingNodeImpl();
 		hostingNode.setUUID(uuid);