diff --git a/src/main/java/org/gcube/smartgears/handler/resourceregistry/EServiceManager.java b/src/main/java/org/gcube/smartgears/handler/resourceregistry/EServiceManager.java
index 79f93fd..b37d094 100644
--- a/src/main/java/org/gcube/smartgears/handler/resourceregistry/EServiceManager.java
+++ b/src/main/java/org/gcube/smartgears/handler/resourceregistry/EServiceManager.java
@@ -316,6 +316,9 @@ public class EServiceManager extends ApplicationLifecycleHandler {
 		} catch (ResourceAlreadyPresentException e) {
 			ResourceRegistryClient registryClient = ResourceRegistryClientFactory.create();
 			eService = registryClient.getInstance(EService.class, eService.getHeader().getUUID());
+			String state = applicationContext.lifecycle().state().remoteForm().toLowerCase();
+			logger.debug("Moving app {} to {}", applicationContext.name(), state);
+			createOrUpdateServiceStateFacet(eService, state);
 		} catch (ResourceAvailableInAnotherContextException e) {
 			// Adding the HostingNode I also add the EService thanks to propagationConstraint 
 			addHostingNodeToCurrentContext();
diff --git a/src/main/java/org/gcube/smartgears/handler/resourceregistry/HostingNodeManager.java b/src/main/java/org/gcube/smartgears/handler/resourceregistry/HostingNodeManager.java
index 6509838..0ba29c8 100644
--- a/src/main/java/org/gcube/smartgears/handler/resourceregistry/HostingNodeManager.java
+++ b/src/main/java/org/gcube/smartgears/handler/resourceregistry/HostingNodeManager.java
@@ -290,6 +290,7 @@ public class HostingNodeManager extends ContainerHandler {
 							hostingNode = registryClient.getInstance(
 									HostingNode.class, hostingNode.getHeader()
 											.getUUID());
+							updateHostingNode(hostingNode);
 						} catch (ResourceAvailableInAnotherContextException e) {
 							addToContext(hostingNode, token);
 						}