diff --git a/group_vars/resource_manager_devsec/resource_manager_devsec.yml b/group_vars/resource_manager_devsec/resource_manager_devsec.yml
index 106d28f..8484539 100644
--- a/group_vars/resource_manager_devsec/resource_manager_devsec.yml
+++ b/group_vars/resource_manager_devsec/resource_manager_devsec.yml
@@ -1,6 +1,6 @@
 start_scopes: 'devsec'
 complete_start_scope: '/gcube/devsec'
-gcore_host: 'node12-d-d4s.d4science.org'
+gcore_host: 'resourcemanager-devsec.cloud-dev.d4science.org'
 resource_manager_docker_stack_name: 'gcore-devsec'
 resource_manager_docker_service_server_name: 'resource-manager'
 
diff --git a/group_vars/vremodeler_dev/vremodeler_dev.yml b/group_vars/vremodeler_dev/vremodeler_dev.yml
index 1fa139b..874aaa6 100644
--- a/group_vars/vremodeler_dev/vremodeler_dev.yml
+++ b/group_vars/vremodeler_dev/vremodeler_dev.yml
@@ -1,5 +1,5 @@
 start_scopes: 'devsec,devNext'
-gcore_host: 'vremodeler-dev.cloud-dev.d4science.org'
+gcore_host: 'vremodeler.cloud-dev.d4science.org'
 vremodeler_docker_stack_name: 'gcore-dev'
 vremodeler_docker_service_server_name: 'vremodeler'
 
diff --git a/inventory/hosts.manager_devsec b/inventory/hosts.manager_devsec
new file mode 100644
index 0000000..ec52603
--- /dev/null
+++ b/inventory/hosts.manager_devsec
@@ -0,0 +1,3 @@
+[resource_manager_devsec]
+#10.1.28.135
+10.1.29.205
diff --git a/inventory/hosts.vremodeler_dev b/inventory/hosts.vremodeler_dev
new file mode 100644
index 0000000..2ab8fdd
--- /dev/null
+++ b/inventory/hosts.vremodeler_dev
@@ -0,0 +1,3 @@
+[is_vremodeler_dev]
+#10.1.28.135
+10.1.29.205
diff --git a/resource-manager.yml b/resource-manager.yml
index 51b21e5..0d36b8a 100644
--- a/resource-manager.yml
+++ b/resource-manager.yml
@@ -1,7 +1,7 @@
 ---
 - name: Configurazione Resource Manager
   #hosts: is_registry_devsec:is_registry_devnext
-  hosts: resource_manager_devnext
+  hosts: resource_manager_devsec
   tasks:
     - name:
       debug:
diff --git a/roles/vremodeler/defaults/main.yml b/roles/vremodeler/defaults/main.yml
index cae49ba..2280c5c 100644
--- a/roles/vremodeler/defaults/main.yml
+++ b/roles/vremodeler/defaults/main.yml
@@ -3,7 +3,7 @@
 service_prefix: 'vremodeler'
 start_scopes: 'devsec,devNext'
 infrastructure: 'gcube'
-gcore_host: 'vremodeler-dev.cloud-dev.d4science.org'
+gcore_host: 'vremodeler.cloud-dev.d4science.org'
 config_dir: 'etc/vremodeler-service-2.2.1-4.3.0-142590-full'
 scope_name: '{{ start_scopes | lower | replace(",", "-") }}'
 vremodeler_compose_dir: '/srv/vremodeler-stack-{{ scope_name }}'