diff --git a/salt/control/placement/openstack/compact.yml b/salt/control/placement/openstack/compact.yml
index f2ec373..8c62e28 100644
--- a/salt/control/placement/openstack/compact.yml
+++ b/salt/control/placement/openstack/compact.yml
@@ -19,47 +19,58 @@
       cluster:
         internal:
           node:
-            ${_param:openstack_control_node01_hostname}:
+            ctl01:
+              name: ${_param:openstack_control_node01_hostname}
               image: ${_param:salt_control_xenial_image}
               provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
               size: openstack.control
-            ${_param:openstack_control_node02_hostname}:
+            ctl02:
+              name: ${_param:openstack_control_node02_hostname}
               image: ${_param:salt_control_xenial_image}
               provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
               size: openstack.control
-            ${_param:openstack_control_node03_hostname}:
+            ctl03:
+              name: ${_param:openstack_control_node03_hostname}
               image: ${_param:salt_control_xenial_image}
               provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
               size: openstack.control
-            ${_param:openstack_database_node01_hostname}:
+            dbs01:
+              name: ${_param:openstack_database_node01_hostname}
               image: ${_param:salt_control_xenial_image}
               provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
               size: openstack.database
-            ${_param:openstack_database_node02_hostname}:
+            dbs02:
+              name: ${_param:openstack_database_node02_hostname}
               image: ${_param:salt_control_xenial_image}
               provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
               size: openstack.database
-            ${_param:openstack_database_node03_hostname}:
+            dbs03:
+              name: ${_param:openstack_database_node03_hostname}
               image: ${_param:salt_control_xenial_image}
               provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
               size: openstack.database
-            ${_param:openstack_message_queue_node01_hostname}:
+            msg01:
+              name: ${_param:openstack_message_queue_node01_hostname}
               image: ${_param:salt_control_xenial_image}
               provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
               size: openstack.message_queue
-            ${_param:openstack_message_queue_node02_hostname}:
+            msg02:
+              name: ${_param:openstack_message_queue_node02_hostname}
               image: ${_param:salt_control_xenial_image}
               provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
               size: openstack.message_queue
-            ${_param:openstack_message_queue_node03_hostname}:
+            msg03:
+              name: ${_param:openstack_message_queue_node03_hostname}
               image: ${_param:salt_control_xenial_image}
               provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
               size: openstack.message_queue
-            ${_param:openstack_proxy_node01_hostname}:
+            prx01:
+              name: ${_param:openstack_proxy_node01_hostname}
               image: ${_param:salt_control_xenial_image}
               provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
               size: openstack.proxy
-            ${_param:openstack_proxy_node02_hostname}:
+            prx02:
+              name: ${_param:openstack_proxy_node02_hostname}
               image: ${_param:salt_control_xenial_image}
               provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
               size: openstack.proxy
diff --git a/salt/control/placement/openstack/large.yml b/salt/control/placement/openstack/large.yml
index 650d4d9..cb056dd 100644
--- a/salt/control/placement/openstack/large.yml
+++ b/salt/control/placement/openstack/large.yml
@@ -26,55 +26,68 @@
       cluster:
         internal:
           node:
-            ${_param:openstack_control_node01_hostname}:
+            ctl01:
+              name: ${_param:openstack_control_node01_hostname}
               image: ${_param:salt_control_xenial_image}
               provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
               size: openstack.control
-            ${_param:openstack_control_node02_hostname}:
+            ctl02:
+              name: ${_param:openstack_control_node02_hostname}
               image: ${_param:salt_control_xenial_image}
               provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
               size: openstack.control
-            ${_param:openstack_control_node03_hostname}:
+            ctl03:
+              name: ${_param:openstack_control_node03_hostname}
               image: ${_param:salt_control_xenial_image}
               provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
               size: openstack.control
-            ${_param:openstack_control_node04_hostname}:
+            ctl04:
+              name: ${_param:openstack_control_node04_hostname}
               image: ${_param:salt_control_xenial_image}
               provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
               size: openstack.control
-            ${_param:openstack_control_node05_hostname}:
+            ctl05:
+              name: ${_param:openstack_control_node05_hostname}
               image: ${_param:salt_control_xenial_image}
               provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
               size: openstack.control
-            ${_param:openstack_database_node01_hostname}:
+            dbs01:
+              name: ${_param:openstack_database_node01_hostname}
               image: ${_param:salt_control_xenial_image}
               provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
               size: openstack.database
-            ${_param:openstack_database_node02_hostname}:
+            dbs02:
+              name: ${_param:openstack_database_node02_hostname}
               image: ${_param:salt_control_xenial_image}
               provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
               size: openstack.database
-            ${_param:openstack_database_node03_hostname}:
+            dbs03:
+              name: ${_param:openstack_database_node03_hostname}
               image: ${_param:salt_control_xenial_image}
               provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
               size: openstack.database
-            ${_param:openstack_message_queue_node01_hostname}:
+            msg01:
+              name: ${_param:openstack_message_queue_node01_hostname}
               image: ${_param:salt_control_xenial_image}
               provider: ${_param:infra_kvm_node07_hostname}.${_param:cluster_domain}
               size: openstack.message_queue
-            ${_param:openstack_message_queue_node02_hostname}:
+            msg02:
+              name: ${_param:openstack_message_queue_node02_hostname}
               image: ${_param:salt_control_xenial_image}
               provider: ${_param:infra_kvm_node08_hostname}.${_param:cluster_domain}
               size: openstack.message_queue
-            ${_param:openstack_message_queue_node03_hostname}:
+            msg03:
+              name: ${_param:openstack_message_queue_node03_hostname}
               image: ${_param:salt_control_xenial_image}
               provider: ${_param:infra_kvm_node09_hostname}.${_param:cluster_domain}
               size: openstack.message_queue
-            ${_param:openstack_proxy_node01_hostname}:
+            prx01:
+              name: ${_param:openstack_proxy_node01_hostname}
               image: ${_param:salt_control_xenial_image}
               provider: ${_param:infra_kvm_node07_hostname}.${_param:cluster_domain}
               size: openstack.proxy
-            ${_param:openstack_proxy_node02_hostname}:
+            prx02:
+              name: ${_param:openstack_proxy_node02_hostname}
               image: ${_param:salt_control_xenial_image}
               provider: ${_param:infra_kvm_node08_hostname}.${_param:cluster_domain}
               size: openstack.proxy
diff --git a/salt/control/placement/openstack/medium.yml b/salt/control/placement/openstack/medium.yml
index de9c010..7d0e166 100644
--- a/salt/control/placement/openstack/medium.yml
+++ b/salt/control/placement/openstack/medium.yml
@@ -22,47 +22,58 @@
       cluster:
         internal:
           node:
-            ${_param:openstack_control_node01_hostname}:
+            ctl01:
+              name: ${_param:openstack_control_node01_hostname}
               image: ${_param:salt_control_xenial_image}
               provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
               size: openstack.control
-            ${_param:openstack_control_node02_hostname}:
+            ctl02:
+              name: ${_param:openstack_control_node02_hostname}
               image: ${_param:salt_control_xenial_image}
               provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
               size: openstack.control
-            ${_param:openstack_control_node03_hostname}:
+            ctl03:
+              name: ${_param:openstack_control_node03_hostname}
               image: ${_param:salt_control_xenial_image}
               provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
               size: openstack.control
-            ${_param:openstack_database_node01_hostname}:
+            dbs01:
+              name: ${_param:openstack_database_node01_hostname}
               image: ${_param:salt_control_xenial_image}
               provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
               size: openstack.database
-            ${_param:openstack_database_node02_hostname}:
+            dbs02:
+              name: ${_param:openstack_database_node02_hostname}
               image: ${_param:salt_control_xenial_image}
               provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
               size: openstack.database
-            ${_param:openstack_database_node03_hostname}:
+            dbs03:
+              name: ${_param:openstack_database_node03_hostname}
               image: ${_param:salt_control_xenial_image}
               provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
               size: openstack.database
-            ${_param:openstack_message_queue_node01_hostname}:
+            msg01:
+              name: ${_param:openstack_message_queue_node01_hostname}
               image: ${_param:salt_control_xenial_image}
               provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
               size: openstack.message_queue
-            ${_param:openstack_message_queue_node02_hostname}:
+            msg02:
+              name: ${_param:openstack_message_queue_node02_hostname}
               image: ${_param:salt_control_xenial_image}
               provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
               size: openstack.message_queue
-            ${_param:openstack_message_queue_node03_hostname}:
+            msg03:
+              name: ${_param:openstack_message_queue_node03_hostname}
               image: ${_param:salt_control_xenial_image}
               provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
               size: openstack.message_queue
-            ${_param:openstack_proxy_node01_hostname}:
+            prx01:
+              name: ${_param:openstack_proxy_node01_hostname}
               image: ${_param:salt_control_xenial_image}
               provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
               size: openstack.proxy
-            ${_param:openstack_proxy_node02_hostname}:
+            prx02:
+              name: ${_param:openstack_proxy_node02_hostname}
               image: ${_param:salt_control_xenial_image}
               provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
               size: openstack.proxy
diff --git a/salt/control/placement/openstack/minimal.yml b/salt/control/placement/openstack/minimal.yml
index f2ec373..8c62e28 100644
--- a/salt/control/placement/openstack/minimal.yml
+++ b/salt/control/placement/openstack/minimal.yml
@@ -19,47 +19,58 @@
       cluster:
         internal:
           node:
-            ${_param:openstack_control_node01_hostname}:
+            ctl01:
+              name: ${_param:openstack_control_node01_hostname}
               image: ${_param:salt_control_xenial_image}
               provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
               size: openstack.control
-            ${_param:openstack_control_node02_hostname}:
+            ctl02:
+              name: ${_param:openstack_control_node02_hostname}
               image: ${_param:salt_control_xenial_image}
               provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
               size: openstack.control
-            ${_param:openstack_control_node03_hostname}:
+            ctl03:
+              name: ${_param:openstack_control_node03_hostname}
               image: ${_param:salt_control_xenial_image}
               provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
               size: openstack.control
-            ${_param:openstack_database_node01_hostname}:
+            dbs01:
+              name: ${_param:openstack_database_node01_hostname}
               image: ${_param:salt_control_xenial_image}
               provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
               size: openstack.database
-            ${_param:openstack_database_node02_hostname}:
+            dbs02:
+              name: ${_param:openstack_database_node02_hostname}
               image: ${_param:salt_control_xenial_image}
               provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
               size: openstack.database
-            ${_param:openstack_database_node03_hostname}:
+            dbs03:
+              name: ${_param:openstack_database_node03_hostname}
               image: ${_param:salt_control_xenial_image}
               provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
               size: openstack.database
-            ${_param:openstack_message_queue_node01_hostname}:
+            msg01:
+              name: ${_param:openstack_message_queue_node01_hostname}
               image: ${_param:salt_control_xenial_image}
               provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
               size: openstack.message_queue
-            ${_param:openstack_message_queue_node02_hostname}:
+            msg02:
+              name: ${_param:openstack_message_queue_node02_hostname}
               image: ${_param:salt_control_xenial_image}
               provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
               size: openstack.message_queue
-            ${_param:openstack_message_queue_node03_hostname}:
+            msg03:
+              name: ${_param:openstack_message_queue_node03_hostname}
               image: ${_param:salt_control_xenial_image}
               provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
               size: openstack.message_queue
-            ${_param:openstack_proxy_node01_hostname}:
+            prx01:
+              name: ${_param:openstack_proxy_node01_hostname}
               image: ${_param:salt_control_xenial_image}
               provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
               size: openstack.proxy
-            ${_param:openstack_proxy_node02_hostname}:
+            prx02:
+              name: ${_param:openstack_proxy_node02_hostname}
               image: ${_param:salt_control_xenial_image}
               provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
               size: openstack.proxy
diff --git a/salt/control/placement/openstack/small.yml b/salt/control/placement/openstack/small.yml
index f2ec373..8c62e28 100644
--- a/salt/control/placement/openstack/small.yml
+++ b/salt/control/placement/openstack/small.yml
@@ -19,47 +19,58 @@
       cluster:
         internal:
           node:
-            ${_param:openstack_control_node01_hostname}:
+            ctl01:
+              name: ${_param:openstack_control_node01_hostname}
               image: ${_param:salt_control_xenial_image}
               provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
               size: openstack.control
-            ${_param:openstack_control_node02_hostname}:
+            ctl02:
+              name: ${_param:openstack_control_node02_hostname}
               image: ${_param:salt_control_xenial_image}
               provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
               size: openstack.control
-            ${_param:openstack_control_node03_hostname}:
+            ctl03:
+              name: ${_param:openstack_control_node03_hostname}
               image: ${_param:salt_control_xenial_image}
               provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
               size: openstack.control
-            ${_param:openstack_database_node01_hostname}:
+            dbs01:
+              name: ${_param:openstack_database_node01_hostname}
               image: ${_param:salt_control_xenial_image}
               provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
               size: openstack.database
-            ${_param:openstack_database_node02_hostname}:
+            dbs02:
+              name: ${_param:openstack_database_node02_hostname}
               image: ${_param:salt_control_xenial_image}
               provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
               size: openstack.database
-            ${_param:openstack_database_node03_hostname}:
+            dbs03:
+              name: ${_param:openstack_database_node03_hostname}
               image: ${_param:salt_control_xenial_image}
               provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
               size: openstack.database
-            ${_param:openstack_message_queue_node01_hostname}:
+            msg01:
+              name: ${_param:openstack_message_queue_node01_hostname}
               image: ${_param:salt_control_xenial_image}
               provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
               size: openstack.message_queue
-            ${_param:openstack_message_queue_node02_hostname}:
+            msg02:
+              name: ${_param:openstack_message_queue_node02_hostname}
               image: ${_param:salt_control_xenial_image}
               provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
               size: openstack.message_queue
-            ${_param:openstack_message_queue_node03_hostname}:
+            msg03:
+              name: ${_param:openstack_message_queue_node03_hostname}
               image: ${_param:salt_control_xenial_image}
               provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
               size: openstack.message_queue
-            ${_param:openstack_proxy_node01_hostname}:
+            prx01:
+              name: ${_param:openstack_proxy_node01_hostname}
               image: ${_param:salt_control_xenial_image}
               provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
               size: openstack.proxy
-            ${_param:openstack_proxy_node02_hostname}:
+            prx02:
+              name: ${_param:openstack_proxy_node02_hostname}
               image: ${_param:salt_control_xenial_image}
               provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
               size: openstack.proxy