diff --git a/pom.xml b/pom.xml
index 089ec16..afffffc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -156,11 +156,6 @@
 				<artifactId>resource-registry-client</artifactId>
 				<version>[5.0.0-SNAPSHOT,6.0.0-SNAPSHOT)</version>
 			</dependency>
-			<dependency>
-				<groupId>org.gcube.information-system</groupId>
-				<artifactId>resource-registry-context-client</artifactId>
-				<version>[5.0.0-SNAPSHOT,6.0.0-SNAPSHOT)</version>
-			</dependency>
 			<dependency>
 				<groupId>org.gcube.information-system</groupId>
 				<artifactId>resource-registry-publisher</artifactId>
@@ -168,14 +163,19 @@
 			</dependency>
 			<dependency>
 				<groupId>org.gcube.information-system</groupId>
-				<artifactId>resource-registry-query-template-client</artifactId>
-				<version>[2.0.0-SNAPSHOT,6.0.0-SNAPSHOT)</version>
+				<artifactId>resource-registry-context-client</artifactId>
+				<version>[5.0.0-SNAPSHOT,6.0.0-SNAPSHOT)</version>
 			</dependency>
 			<dependency>
 				<groupId>org.gcube.information-system</groupId>
 				<artifactId>resource-registry-schema-client</artifactId>
 				<version>[5.0.0-SNAPSHOT,6.0.0-SNAPSHOT)</version>
 			</dependency>
+			<dependency>
+				<groupId>org.gcube.information-system</groupId>
+				<artifactId>resource-registry-query-template-client</artifactId>
+				<version>[2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)</version>
+			</dependency>
 			<!-- END Facets Based Resource Model related dependencies -->
 
 			<!-- Clients Related Dependencies -->