diff --git a/group_vars/is_registry_gcube/is_registry_gcube.yml b/group_vars/is_registry_gcube/is_registry_gcube.yml
new file mode 100644
index 0000000..661ad88
--- /dev/null
+++ b/group_vars/is_registry_gcube/is_registry_gcube.yml
@@ -0,0 +1,7 @@
+start_scopes: 'gcube'
+complete_start_scope: '/gcube'
+gcore_host: 'registry-gcube.cloud-dev.d4science.org'
+collector_url: 'http://node8-d-d4s.d4science.org:8000'
+is_registry_docker_stack_name: 'gcore-gcube'
+is_registry_docker_service_server_name: 'is-registry'
+
diff --git a/inventory/hosts.registry_gcube b/inventory/hosts.registry_gcube
new file mode 100644
index 0000000..14345e5
--- /dev/null
+++ b/inventory/hosts.registry_gcube
@@ -0,0 +1,6 @@
+[is_registry_gcube]
+#10.1.28.135
+10.1.29.205
+
+
+
diff --git a/roles/is-registry/defaults/main.yml b/roles/is-registry/defaults/main.yml
index 36725f4..0b68d2b 100644
--- a/roles/is-registry/defaults/main.yml
+++ b/roles/is-registry/defaults/main.yml
@@ -5,7 +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'
+collector_url: 'http://node22.d.d4science.research-infrastructures.eu:8080'
 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 b910eaa..e07fccc 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://{{ 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 ="ISICAllQueryPT" endpoint ="{{ collector_url }}/wsrf/services/gcube/informationsystem/collector/XQueryAccess"/>
+	<Service name ="ISICAllRegistrationPT" endpoint ="{{ collector_url }}/wsrf/services/gcube/informationsystem/collector/Sink"/>  
+	<Service name ="ISICAllCollectionPT" endpoint ="{{ collector_url }}/wsrf/services/gcube/informationsystem/collector/wsdaix/XMLCollectionAccess"/>
+	<Service name ="ISICAllStoragePT" endpoint ="{{ collector_url }}/wsrf/services/gcube/informationsystem/collector/XMLStorageAccess"/>
 	<Service name ="ISRegistry" endpoint="http://{{ gcore_host }}:8080/wsrf/services/gcube/informationsystem/registry/ResourceRegistration"/>
 </ServiceMap>