diff --git a/group_vars/is_registry_devnext/is_registry_devnext.yml b/group_vars/is_registry_devnext/is_registry_devnext.yml
index 1a32a16..12dc98e 100644
--- a/group_vars/is_registry_devnext/is_registry_devnext.yml
+++ b/group_vars/is_registry_devnext/is_registry_devnext.yml
@@ -1,6 +1,7 @@
 start_scopes: 'devNext'
 complete_start_scope: '/gcube/devNext'
 gcore_host: 'node14-d-d4s.d4science.org'
+collector_host: 'node22.d.d4science.research-infrastructures.eu'
 is_registry_docker_stack_name: 'gcore-devnext'
 is_registry_docker_service_server_name: 'is-registry'
 
diff --git a/group_vars/is_registry_devsec/is_registry_devsec.yml b/group_vars/is_registry_devsec/is_registry_devsec.yml
index 98bf8a5..5c19bda 100644
--- a/group_vars/is_registry_devsec/is_registry_devsec.yml
+++ b/group_vars/is_registry_devsec/is_registry_devsec.yml
@@ -1,5 +1,6 @@
 start_scopes: 'devsec'
 complete_start_scope: '/gcube/devsec'
 gcore_host: 'node3.d.d4science.research-infrastructures.eu'
+collector_host: 'node2.d4science.org'
 is_registry_docker_stack_name: 'gcore-devsec'
 is_registry_docker_service_server_name: 'is-registry'
diff --git a/roles/is-registry/defaults/main.yml b/roles/is-registry/defaults/main.yml
index b09dfa3..36725f4 100644
--- a/roles/is-registry/defaults/main.yml
+++ b/roles/is-registry/defaults/main.yml
@@ -5,6 +5,7 @@ start_scopes: 'devNext'
 infrastructure: 'gcube'
 complete_start_scope: '/gcube/devNext'
 gcore_host: 'node14-d-d4s.d4science.org'
+collector_host: 'node22.d.d4science.research-infrastructures.eu'
 config_dir: 'etc/is-registry-service'
 scope_name: '{{ start_scopes | lower }}'
 is_registry_compose_dir: '/srv/is-registry-stack-{{ scope_name }}'
diff --git a/roles/is-registry/templates/ServiceMap.xml.j2 b/roles/is-registry/templates/ServiceMap.xml.j2
index b65f06b..b910eaa 100644
--- a/roles/is-registry/templates/ServiceMap.xml.j2
+++ b/roles/is-registry/templates/ServiceMap.xml.j2
@@ -1,7 +1,7 @@
 <ServiceMap>	
-	<Service name ="ISICAllQueryPT" endpoint ="http://node2.d4science.org:8080/wsrf/services/gcube/informationsystem/collector/XQueryAccess"/>
-	<Service name ="ISICAllRegistrationPT" endpoint ="http://node2.d4science.org:8080/wsrf/services/gcube/informationsystem/collector/Sink"/>  
-	<Service name ="ISICAllCollectionPT" endpoint ="http://node2.d4science.org:8080/wsrf/services/gcube/informationsystem/collector/wsdaix/XMLCollectionAccess"/>
-	<Service name ="ISICAllStoragePT" endpoint ="http://node2.d4science.org:8080/wsrf/services/gcube/informationsystem/collector/XMLStorageAccess"/>
+	<Service name ="ISICAllQueryPT" endpoint ="http://{{ collector_host }}:8080/wsrf/services/gcube/informationsystem/collector/XQueryAccess"/>
+	<Service name ="ISICAllRegistrationPT" endpoint ="http://{{ collector_host }}:8080/wsrf/services/gcube/informationsystem/collector/Sink"/>  
+	<Service name ="ISICAllCollectionPT" endpoint ="http://{{ collector_host }}:8080/wsrf/services/gcube/informationsystem/collector/wsdaix/XMLCollectionAccess"/>
+	<Service name ="ISICAllStoragePT" endpoint ="http://{{ collector_host }}:8080/wsrf/services/gcube/informationsystem/collector/XMLStorageAccess"/>
 	<Service name ="ISRegistry" endpoint="http://{{ gcore_host }}:8080/wsrf/services/gcube/informationsystem/registry/ResourceRegistration"/>
 </ServiceMap>