diff --git a/output_files_generated/nginx_openstack/nginx/config.yaml b/output_files_generated/nginx_openstack/nginx/config.yaml
index 7778c71d6b0453c44ab84da50655e5740087e2f4..dff8ba5cf049d5f986d11fcaad55b49d2bf9e65a 100644
--- a/output_files_generated/nginx_openstack/nginx/config.yaml
+++ b/output_files_generated/nginx_openstack/nginx/config.yaml
@@ -1,7 +1,7 @@
 
 ---
 input:
-  - instance_ip_nginx-host
+  - instance_ip_vm1
   - instance_server_private_key_ssh_key
 output: []
 engine: ansible
diff --git a/output_files_generated/nginx_openstack/nginx/inventory.j2 b/output_files_generated/nginx_openstack/nginx/inventory.j2
index b95b2c1b62b32c96567de07cb942b4482158a272..c869825264308b4b47ca862b8b9e22d3bc733f11 100644
--- a/output_files_generated/nginx_openstack/nginx/inventory.j2
+++ b/output_files_generated/nginx_openstack/nginx/inventory.j2
@@ -1,7 +1,7 @@
 
 
 [servers_for_nginx]
-{{ instance_ip_nginx-host }}
+{{ instance_ip_vm1 }}
 
 [servers_for_nginx:vars]
 ansible_connection=ssh
diff --git a/output_files_generated/nginx_openstack/piacere_monitoring/config.yaml b/output_files_generated/nginx_openstack/piacere_monitoring/config.yaml
index 7778c71d6b0453c44ab84da50655e5740087e2f4..dff8ba5cf049d5f986d11fcaad55b49d2bf9e65a 100644
--- a/output_files_generated/nginx_openstack/piacere_monitoring/config.yaml
+++ b/output_files_generated/nginx_openstack/piacere_monitoring/config.yaml
@@ -1,7 +1,7 @@
 
 ---
 input:
-  - instance_ip_nginx-host
+  - instance_ip_vm1
   - instance_server_private_key_ssh_key
 output: []
 engine: ansible
diff --git a/output_files_generated/nginx_openstack/piacere_monitoring/inventory.j2 b/output_files_generated/nginx_openstack/piacere_monitoring/inventory.j2
index 2eaf2660367c17d52f3a287a33c12ae571df7ba4..fda17b36f330a491a1fd872a13c5eed702e1b122 100644
--- a/output_files_generated/nginx_openstack/piacere_monitoring/inventory.j2
+++ b/output_files_generated/nginx_openstack/piacere_monitoring/inventory.j2
@@ -1,7 +1,7 @@
 
 
 [servers_for_piacere_monitoring]
-{{ instance_ip_nginx-host }}
+{{ instance_ip_vm1 }}
 
 [servers_for_piacere_monitoring:vars]
 ansible_connection=ssh
diff --git a/output_files_generated/nginx_openstack/terraform/config.yaml b/output_files_generated/nginx_openstack/terraform/config.yaml
index 3262fae672be5908e50e662a0bd77f002a9594c6..21942c2d2bd4b40c31cf45e4625db768af274e58 100644
--- a/output_files_generated/nginx_openstack/terraform/config.yaml
+++ b/output_files_generated/nginx_openstack/terraform/config.yaml
@@ -11,6 +11,6 @@ output:
 
   - instance_server_public_key_ssh_key
   - instance_server_private_key_ssh_key
-  - instance_ip_nginx-host
+  - instance_ip_vm1
 
 ...
diff --git a/output_files_generated/nginx_openstack/terraform/main.tf b/output_files_generated/nginx_openstack/terraform/main.tf
index 3ceb8fa4cbb8d872ca716e3c3c1ccbe44e297f25..30cac937f1e2b1df0b39e448b366bb84359040e2 100644
--- a/output_files_generated/nginx_openstack/terraform/main.tf
+++ b/output_files_generated/nginx_openstack/terraform/main.tf
@@ -91,14 +91,6 @@ resource "openstack_networking_router_interface_v2" "net1_router_interface" {
 
 
 
-# Create ssh keys
-resource "openstack_compute_keypair_v2" "ssh_key" {
-  name       = "user1"
-  # public_key = "user1"
-}
-
-
-
 # CREATING SECURITY_GROUP
   
 resource "openstack_compute_secgroup_v2" "icmp" {
@@ -146,3 +138,11 @@ resource "openstack_compute_secgroup_v2" "ssh" {
 }
 
 
+
+
+# Create ssh keys
+resource "openstack_compute_keypair_v2" "ssh_key" {
+  name       = "user1"
+  # public_key = "user1"
+}
+
diff --git a/output_files_generated/nginx_openstack/terraform/output.tf b/output_files_generated/nginx_openstack/terraform/output.tf
index 6fcb19b25700b08936928d8fef0c8db55047eb0e..5c4fe2796f1f4e5be75509c6bb9f3cb90bd85576 100644
--- a/output_files_generated/nginx_openstack/terraform/output.tf
+++ b/output_files_generated/nginx_openstack/terraform/output.tf
@@ -8,7 +8,7 @@ output "instance_server_private_key_ssh_key" {
   value = openstack_compute_keypair_v2.ssh_key.private_key
 }
 
-output "instance_ip_nginx-host" {
+output "instance_ip_vm1" {
   value = openstack_compute_floatingip_associate_v2.vm1_floating_ip_association.floating_ip
 }
 
diff --git a/templates/ansible/ubuntu/config.tpl b/templates/ansible/ubuntu/config.tpl
index 015123ee6f50408cd6b038e8088963171031dc5e..91ddccee1d6e0920ed7c89445f5ec98321eff828 100644
--- a/templates/ansible/ubuntu/config.tpl
+++ b/templates/ansible/ubuntu/config.tpl
@@ -15,7 +15,7 @@
 #}
 ---
 input:
-  - instance_ip_{{ node.vm_name }}
+  - instance_ip_{{ node.infra_element_name }}
   - instance_server_private_key_{{ node.credentials }}
 output: []
 engine: ansible
diff --git a/templates/ansible/ubuntu/inventory.tpl b/templates/ansible/ubuntu/inventory.tpl
index 9f59b2a0f26e2a34b1a6dba600c0a2dd307bd2c8..2c64481d048089136ee067301132be913c28d36d 100644
--- a/templates/ansible/ubuntu/inventory.tpl
+++ b/templates/ansible/ubuntu/inventory.tpl
@@ -15,7 +15,7 @@
 #}
 
 [{{ "servers_for_" ~ name }}]
-{% raw %}{{ instance_ip_{% endraw %}{{ node.vm_name }} {% raw %}}}{% endraw %}
+{% raw %}{{ instance_ip_{% endraw %}{{ node.infra_element_name }} {% raw %}}}{% endraw %}
 
 [{{ "servers_for_" ~ name }}:vars]
 ansible_connection=ssh
diff --git a/templates/terraform/open_stack/config.tpl b/templates/terraform/open_stack/config.tpl
index a50ebb71b9ec2dc84e8c3a0230ea26dcae6b767f..9aa85acf80c498b30ca20a55971979873a60cec8 100644
--- a/templates/terraform/open_stack/config.tpl
+++ b/templates/terraform/open_stack/config.tpl
@@ -25,6 +25,6 @@ output:
 {% for vm in vms %}
   - instance_server_public_key_{{ vm.credentials }}
   - instance_server_private_key_{{ vm.credentials }}
-  - instance_ip_{{ vm.vm_name }}
+  - instance_ip_{{ vm.infra_element_name }}
 {% endfor %}
 ...
diff --git a/templates/terraform/open_stack/virtual_machine_out.tpl b/templates/terraform/open_stack/virtual_machine_out.tpl
index 8f5f19ea0a7ad4644e1612a7e3aa5a8c80e22004..3b25ad5718be3016166d70140082e848006153ae 100644
--- a/templates/terraform/open_stack/virtual_machine_out.tpl
+++ b/templates/terraform/open_stack/virtual_machine_out.tpl
@@ -22,6 +22,6 @@ output "instance_server_private_key_{{ credentials }}" {
   value = openstack_compute_keypair_v2.{{ credentials }}.private_key
 }
 
-output "instance_ip_{{ vm_name }}" {
+output "instance_ip_{{ infra_element_name }}" {
   value = openstack_compute_floatingip_associate_v2.{{ infra_element_name ~ "_floating_ip_association" }}.floating_ip
 }
\ No newline at end of file