diff --git a/src/main/java/org/gcube/vremanagement/executor/client/query/Discover.java b/src/main/java/org/gcube/vremanagement/executor/client/query/Discover.java
index e50341c..ce5c0c5 100644
--- a/src/main/java/org/gcube/vremanagement/executor/client/query/Discover.java
+++ b/src/main/java/org/gcube/vremanagement/executor/client/query/Discover.java
@@ -20,6 +20,7 @@ public abstract class Discover {
 		return ICFactory.queryFor(GCoreEndpoint.class)
 				.addCondition(String.format("$resource/Profile/ServiceClass/text() eq '%s'", Constants.SERVICE_CLASS))
 				.addCondition(String.format("$resource/Profile/ServiceName/text() eq '%s'", Constants.SERVICE_NAME))
+				.addCondition("starts-with($resource/Profile/Version/text(),'2')")
 				.addCondition(String.format("$resource/Profile/DeploymentData/Status/text() eq 'ready'"))
 				.addVariable("$entry", "$resource/Profile/AccessPoint/RunningInstanceInterfaces/Endpoint")
 				.addCondition(String.format("$entry/@EntryName eq '%s'", Constants.SERVICE_ENTRY_NAME))