diff --git a/salt/control/sizes/ceph.yml b/salt/control/sizes/ceph.yml
index a4be9c9..c475296 100644
--- a/salt/control/sizes/ceph.yml
+++ b/salt/control/sizes/ceph.yml
@@ -16,8 +16,10 @@
           ram: ${_param:salt_control_size_ram_ceph_mon}
           disk_profile: ${_param:salt_control_size_disk_profile_ceph_mon}
           net_profile: ${_param:salt_control_size_net_profile_ceph_mon}
+          image_layout: ${_param:salt_control_size_image_layout_ceph_mon}
         ceph.rgw:
           cpu: ${_param:salt_control_size_cpu_ceph_rgw}
           ram: ${_param:salt_control_size_ram_ceph_rgw}
           disk_profile: ${_param:salt_control_size_disk_profile_ceph_rgw}
           net_profile: ${_param:salt_control_size_net_profile_ceph_rgw}
+          image_layout: ${_param:salt_control_size_image_layout_ceph_rgw}
diff --git a/salt/control/sizes/cicd.yml b/salt/control/sizes/cicd.yml
index a2ada77..ac99b1c 100644
--- a/salt/control/sizes/cicd.yml
+++ b/salt/control/sizes/cicd.yml
@@ -12,3 +12,4 @@
           ram: ${_param:salt_control_size_ram_cicd_control}
           disk_profile: ${_param:salt_control_size_disk_profile_cicd_control}
           net_profile: ${_param:salt_control_size_net_profile_cicd_control}
+          image_layout: ${_param:salt_control_size_image_layout_cicd_control}
diff --git a/salt/control/sizes/cicd/compact.yml b/salt/control/sizes/cicd/compact.yml
index 78cb384..09d5a95 100644
--- a/salt/control/sizes/cicd/compact.yml
+++ b/salt/control/sizes/cicd/compact.yml
@@ -11,4 +11,5 @@
           cpu: ${_param:salt_control_size_cpu_cicd_control}
           ram: ${_param:salt_control_size_ram_cicd_control}
           disk_profile: ${_param:salt_control_size_disk_profile_cicd_control}
-          net_profile: ${_param:salt_control_size_net_profile_cicd_control}
\ No newline at end of file
+          net_profile: ${_param:salt_control_size_net_profile_cicd_control}
+          image_layout: ${_param:salt_control_size_image_layout_cicd_control}
diff --git a/salt/control/sizes/cicd/large.yml b/salt/control/sizes/cicd/large.yml
index 3250dc0..990c3d4 100644
--- a/salt/control/sizes/cicd/large.yml
+++ b/salt/control/sizes/cicd/large.yml
@@ -11,4 +11,5 @@
           cpu: ${_param:salt_control_size_cpu_cicd_control}
           ram: ${_param:salt_control_size_ram_cicd_control}
           disk_profile: ${_param:salt_control_size_disk_profile_cicd_control}
-          net_profile: ${_param:salt_control_size_net_profile_cicd_control}
\ No newline at end of file
+          net_profile: ${_param:salt_control_size_net_profile_cicd_control}
+          image_layout: ${_param:salt_control_size_image_layout_cicd_control}
diff --git a/salt/control/sizes/cicd/medium.yml b/salt/control/sizes/cicd/medium.yml
index 8735537..1b5d7e1 100644
--- a/salt/control/sizes/cicd/medium.yml
+++ b/salt/control/sizes/cicd/medium.yml
@@ -11,4 +11,5 @@
           cpu: ${_param:salt_control_size_cpu_cicd_control}
           ram: ${_param:salt_control_size_ram_cicd_control}
           disk_profile: ${_param:salt_control_size_disk_profile_cicd_control}
-          net_profile: ${_param:salt_control_size_net_profile_cicd_control}
\ No newline at end of file
+          net_profile: ${_param:salt_control_size_net_profile_cicd_control}
+          image_layout: ${_param:salt_control_size_image_layout_cicd_control}
diff --git a/salt/control/sizes/cicd/minimal.yml b/salt/control/sizes/cicd/minimal.yml
index 6e61013..f420bb9 100644
--- a/salt/control/sizes/cicd/minimal.yml
+++ b/salt/control/sizes/cicd/minimal.yml
@@ -11,4 +11,5 @@
           cpu: ${_param:salt_control_size_cpu_cicd_control}
           ram: ${_param:salt_control_size_ram_cicd_control}
           disk_profile: ${_param:salt_control_size_disk_profile_cicd_control}
-          net_profile: ${_param:salt_control_size_net_profile_cicd_control}
\ No newline at end of file
+          net_profile: ${_param:salt_control_size_net_profile_cicd_control}
+          image_layout: ${_param:salt_control_size_image_layout_cicd_control}
diff --git a/salt/control/sizes/cicd/small.yml b/salt/control/sizes/cicd/small.yml
index 8735537..1b5d7e1 100644
--- a/salt/control/sizes/cicd/small.yml
+++ b/salt/control/sizes/cicd/small.yml
@@ -11,4 +11,5 @@
           cpu: ${_param:salt_control_size_cpu_cicd_control}
           ram: ${_param:salt_control_size_ram_cicd_control}
           disk_profile: ${_param:salt_control_size_disk_profile_cicd_control}
-          net_profile: ${_param:salt_control_size_net_profile_cicd_control}
\ No newline at end of file
+          net_profile: ${_param:salt_control_size_net_profile_cicd_control}
+          image_layout: ${_param:salt_control_size_image_layout_cicd_control}
diff --git a/salt/control/sizes/opencontrail.yml b/salt/control/sizes/opencontrail.yml
index 41b858d..bf4810e 100644
--- a/salt/control/sizes/opencontrail.yml
+++ b/salt/control/sizes/opencontrail.yml
@@ -16,8 +16,10 @@
           ram: ${_param:salt_control_size_ram_opencontrail_control}
           disk_profile: ${_param:salt_control_size_disk_profile_opencontrail_control}
           net_profile: ${_param:salt_control_size_net_profile_opencontrail_control}
+          image_layout: ${_param:salt_control_size_image_layout_opencontrail_control}
         opencontrail.analytics:
           cpu: ${_param:salt_control_size_cpu_opencontrail_analytics}
           ram: ${_param:salt_control_size_ram_opencontrail_analytics}
           disk_profile: ${_param:salt_control_size_disk_profile_opencontrail_analytics}
           net_profile: ${_param:salt_control_size_net_profile_opencontrail_analytics}
+          image_layout: ${_param:salt_control_size_image_layout_opencontrail_analytics}
diff --git a/salt/control/sizes/opencontrail/compact.yml b/salt/control/sizes/opencontrail/compact.yml
index e650d86..38b4f35 100644
--- a/salt/control/sizes/opencontrail/compact.yml
+++ b/salt/control/sizes/opencontrail/compact.yml
@@ -16,8 +16,10 @@
           ram: ${_param:salt_control_size_ram_opencontrail_control}
           disk_profile: ${_param:salt_control_size_disk_profile_opencontrail_control}
           net_profile: ${_param:salt_control_size_net_profile_opencontrail_control}
+          image_layout: ${_param:salt_control_size_image_layout_opencontrail_control}
         opencontrail.analytics:
           cpu: ${_param:salt_control_size_cpu_opencontrail_analytics}
           ram: ${_param:salt_control_size_ram_opencontrail_analytics}
           disk_profile: ${_param:salt_control_size_disk_profile_opencontrail_analytics}
-          net_profile: ${_param:salt_control_size_net_profile_opencontrail_analytics}
\ No newline at end of file
+          net_profile: ${_param:salt_control_size_net_profile_opencontrail_analytics}
+          image_layout: ${_param:salt_control_size_image_layout_opencontrail_analytics}
diff --git a/salt/control/sizes/opencontrail/large.yml b/salt/control/sizes/opencontrail/large.yml
index 0b0ed56..0affca2 100644
--- a/salt/control/sizes/opencontrail/large.yml
+++ b/salt/control/sizes/opencontrail/large.yml
@@ -16,8 +16,10 @@
           ram: ${_param:salt_control_size_ram_opencontrail_control}
           disk_profile: ${_param:salt_control_size_disk_profile_opencontrail_control}
           net_profile: ${_param:salt_control_size_net_profile_opencontrail_control}
+          image_layout: ${_param:salt_control_size_image_layout_opencontrail_control}
         opencontrail.analytics:
           cpu: ${_param:salt_control_size_cpu_opencontrail_analytics}
           ram: ${_param:salt_control_size_ram_opencontrail_analytics}
           disk_profile: ${_param:salt_control_size_disk_profile_opencontrail_analytics}
-          net_profile: ${_param:salt_control_size_net_profile_opencontrail_analytics}
\ No newline at end of file
+          net_profile: ${_param:salt_control_size_net_profile_opencontrail_analytics}
+          image_layout: ${_param:salt_control_size_image_layout_opencontrail_analytics}
diff --git a/salt/control/sizes/opencontrail/medium.yml b/salt/control/sizes/opencontrail/medium.yml
index 48f62c3..3690a11 100644
--- a/salt/control/sizes/opencontrail/medium.yml
+++ b/salt/control/sizes/opencontrail/medium.yml
@@ -16,8 +16,10 @@
           ram: ${_param:salt_control_size_ram_opencontrail_control}
           disk_profile: ${_param:salt_control_size_disk_profile_opencontrail_control}
           net_profile: ${_param:salt_control_size_net_profile_opencontrail_control}
+          image_layout: ${_param:salt_control_size_image_layout_opencontrail_control}
         opencontrail.analytics:
           cpu: ${_param:salt_control_size_cpu_opencontrail_analytics}
           ram: ${_param:salt_control_size_ram_opencontrail_analytics}
           disk_profile: ${_param:salt_control_size_disk_profile_opencontrail_analytics}
-          net_profile: ${_param:salt_control_size_net_profile_opencontrail_analytics}
\ No newline at end of file
+          net_profile: ${_param:salt_control_size_net_profile_opencontrail_analytics}
+          image_layout: ${_param:salt_control_size_image_layout_opencontrail_analytics}
diff --git a/salt/control/sizes/opencontrail/minimal.yml b/salt/control/sizes/opencontrail/minimal.yml
index b6f893f..de7fa6d 100644
--- a/salt/control/sizes/opencontrail/minimal.yml
+++ b/salt/control/sizes/opencontrail/minimal.yml
@@ -16,8 +16,10 @@
           ram: ${_param:salt_control_size_ram_opencontrail_control}
           disk_profile: ${_param:salt_control_size_disk_profile_opencontrail_control}
           net_profile: ${_param:salt_control_size_net_profile_opencontrail_control}
+          image_layout: ${_param:salt_control_size_image_layout_opencontrail_control}
         opencontrail.analytics:
           cpu: ${_param:salt_control_size_cpu_opencontrail_analytics}
           ram: ${_param:salt_control_size_ram_opencontrail_analytics}
           disk_profile: ${_param:salt_control_size_disk_profile_opencontrail_analytics}
-          net_profile: ${_param:salt_control_size_net_profile_opencontrail_analytics}
\ No newline at end of file
+          net_profile: ${_param:salt_control_size_net_profile_opencontrail_analytics}
+          image_layout: ${_param:salt_control_size_image_layout_opencontrail_analytics}
diff --git a/salt/control/sizes/opencontrail/small.yml b/salt/control/sizes/opencontrail/small.yml
index e650d86..38b4f35 100644
--- a/salt/control/sizes/opencontrail/small.yml
+++ b/salt/control/sizes/opencontrail/small.yml
@@ -16,8 +16,10 @@
           ram: ${_param:salt_control_size_ram_opencontrail_control}
           disk_profile: ${_param:salt_control_size_disk_profile_opencontrail_control}
           net_profile: ${_param:salt_control_size_net_profile_opencontrail_control}
+          image_layout: ${_param:salt_control_size_image_layout_opencontrail_control}
         opencontrail.analytics:
           cpu: ${_param:salt_control_size_cpu_opencontrail_analytics}
           ram: ${_param:salt_control_size_ram_opencontrail_analytics}
           disk_profile: ${_param:salt_control_size_disk_profile_opencontrail_analytics}
-          net_profile: ${_param:salt_control_size_net_profile_opencontrail_analytics}
\ No newline at end of file
+          net_profile: ${_param:salt_control_size_net_profile_opencontrail_analytics}
+          image_layout: ${_param:salt_control_size_image_layout_opencontrail_analytics}
diff --git a/salt/control/sizes/openstack.yml b/salt/control/sizes/openstack.yml
index b75161b..96ab008 100644
--- a/salt/control/sizes/openstack.yml
+++ b/salt/control/sizes/openstack.yml
@@ -28,23 +28,28 @@
           ram: ${_param:salt_control_size_ram_openstack_control}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_control}
           net_profile: ${_param:salt_control_size_net_profile_openstack_control}
+          image_layout: ${_param:salt_control_size_image_layout_openstack_control}
         openstack.database:
           cpu: ${_param:salt_control_size_cpu_openstack_database}
           ram: ${_param:salt_control_size_ram_openstack_database}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_database}
           net_profile: ${_param:salt_control_size_net_profile_openstack_database}
+          image_layout: ${_param:salt_control_size_image_layout_openstack_database}
         openstack.message_queue:
           cpu: ${_param:salt_control_size_cpu_openstack_message_queue}
           ram: ${_param:salt_control_size_ram_openstack_message_queue}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_message_queue}
           net_profile: ${_param:salt_control_size_net_profile_openstack_message_queue}
+          image_layout: ${_param:salt_control_size_image_layout_openstack_message_queue}
         openstack.proxy:
           cpu: ${_param:salt_control_size_cpu_openstack_proxy}
           ram: ${_param:salt_control_size_ram_openstack_proxy}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_proxy}
           net_profile: ${_param:salt_control_size_net_profile_openstack_proxy}
+          image_layout: ${_param:salt_control_size_image_layout_openstack_proxy}
         openstack.upgrade:
           cpu: ${_param:salt_control_size_cpu_openstack_upgrade}
           ram: ${_param:salt_control_size_ram_openstack_upgrade}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_upgrade}
           net_profile: ${_param:salt_control_size_net_profile_openstack_upgrade}
+          image_layout: ${_param:salt_control_size_image_layout_openstack_upgrade}
diff --git a/salt/control/sizes/openstack/compact.yml b/salt/control/sizes/openstack/compact.yml
index 4955911..70e4ff2 100644
--- a/salt/control/sizes/openstack/compact.yml
+++ b/salt/control/sizes/openstack/compact.yml
@@ -48,48 +48,58 @@
           ram: ${_param:salt_control_size_ram_openstack_control}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_control}
           net_profile: ${_param:salt_control_size_net_profile_openstack_control}
+          image_layout: ${_param:salt_control_size_image_layout_openstack_control}
         openstack.database:
           cpu: ${_param:salt_control_size_cpu_openstack_database}
           ram: ${_param:salt_control_size_ram_openstack_database}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_database}
           net_profile: ${_param:salt_control_size_net_profile_openstack_database}
+          image_layout: ${_param:salt_control_size_image_layout_openstack_database}
         openstack.message_queue:
           cpu: ${_param:salt_control_size_cpu_openstack_message_queue}
           ram: ${_param:salt_control_size_ram_openstack_message_queue}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_message_queue}
           net_profile: ${_param:salt_control_size_net_profile_openstack_message_queue}
+          image_layout: ${_param:salt_control_size_image_layout_openstack_message_queue}
         openstack.proxy:
           cpu: ${_param:salt_control_size_cpu_openstack_proxy}
           ram: ${_param:salt_control_size_ram_openstack_proxy}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_proxy}
           net_profile: ${_param:salt_control_size_net_profile_openstack_proxy}
+          image_layout: ${_param:salt_control_size_image_layout_openstack_proxy}
         openstack.upgrade:
           cpu: ${_param:salt_control_size_cpu_openstack_upgrade}
           ram: ${_param:salt_control_size_ram_openstack_upgrade}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_upgrade}
           net_profile: ${_param:salt_control_size_net_profile_openstack_upgrade}
+          image_layout: ${_param:salt_control_size_image_layout_openstack_upgrade}
         openstack.share:
           cpu: ${_param:salt_control_size_cpu_openstack_share}
           ram: ${_param:salt_control_size_ram_openstack_share}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_share}
           net_profile: ${_param:salt_control_size_net_profile_openstack_share}
+          image_layout: ${_param:salt_control_size_image_layout_openstack_share}
         openstack.dns:
           cpu: ${_param:salt_control_size_cpu_openstack_dns}
           ram: ${_param:salt_control_size_ram_openstack_dns}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_dns}
           net_profile: ${_param:salt_control_size_net_profile_openstack_dns}
+          image_layout: ${_param:salt_control_size_image_layout_openstack_dns}
         openstack.telemetry:
           cpu: ${_param:salt_control_size_cpu_openstack_telemetry}
           ram: ${_param:salt_control_size_ram_openstack_telemetry}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_telemetry}
           net_profile: ${_param:salt_control_size_net_profile_openstack_telemetry}
+          image_layout: ${_param:salt_control_size_image_layout_openstack_telemetry}
         openstack.barbican:
           cpu: ${_param:salt_control_size_cpu_openstack_barbican}
           ram: ${_param:salt_control_size_ram_openstack_barbican}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_barbican}
           net_profile: ${_param:salt_control_size_net_profile_openstack_barbican}
+          image_layout: ${_param:salt_control_size_image_layout_openstack_barbican}
         openstack.baremetal:
           cpu: ${_param:salt_control_size_cpu_openstack_baremetal}
           ram: ${_param:salt_control_size_ram_openstack_baremetal}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_baremetal}
-          net_profile: ${_param:salt_control_size_net_profile_openstack_baremetal}
\ No newline at end of file
+          net_profile: ${_param:salt_control_size_net_profile_openstack_baremetal}
+          image_layout: ${_param:salt_control_size_image_layout_openstack_baremetal}
diff --git a/salt/control/sizes/openstack/large.yml b/salt/control/sizes/openstack/large.yml
index cd7d71e..38dc313 100644
--- a/salt/control/sizes/openstack/large.yml
+++ b/salt/control/sizes/openstack/large.yml
@@ -48,48 +48,58 @@
           ram: ${_param:salt_control_size_ram_openstack_control}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_control}
           net_profile: ${_param:salt_control_size_net_profile_openstack_control}
+          image_layout: ${_param:salt_control_size_image_layout_openstack_control}
         openstack.database:
           cpu: ${_param:salt_control_size_cpu_openstack_database}
           ram: ${_param:salt_control_size_ram_openstack_database}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_database}
           net_profile: ${_param:salt_control_size_net_profile_openstack_database}
+          image_layout: ${_param:salt_control_size_image_layout_openstack_database}
         openstack.message_queue:
           cpu: ${_param:salt_control_size_cpu_openstack_message_queue}
           ram: ${_param:salt_control_size_ram_openstack_message_queue}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_message_queue}
           net_profile: ${_param:salt_control_size_net_profile_openstack_message_queue}
+          image_layout: ${_param:salt_control_size_image_layout_openstack_message_queue}
         openstack.proxy:
           cpu: ${_param:salt_control_size_cpu_openstack_proxy}
           ram: ${_param:salt_control_size_ram_openstack_proxy}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_proxy}
           net_profile: ${_param:salt_control_size_net_profile_openstack_proxy}
+          image_layout: ${_param:salt_control_size_image_layout_openstack_proxy}
         openstack.upgrade:
           cpu: ${_param:salt_control_size_cpu_openstack_upgrade}
           ram: ${_param:salt_control_size_ram_openstack_upgrade}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_upgrade}
           net_profile: ${_param:salt_control_size_net_profile_openstack_upgrade}
+          image_layout: ${_param:salt_control_size_image_layout_openstack_upgrade}
         openstack.share:
           cpu: ${_param:salt_control_size_cpu_openstack_share}
           ram: ${_param:salt_control_size_ram_openstack_share}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_share}
           net_profile: ${_param:salt_control_size_net_profile_openstack_share}
+          image_layout: ${_param:salt_control_size_image_layout_openstack_share}
         openstack.dns:
           cpu: ${_param:salt_control_size_cpu_openstack_dns}
           ram: ${_param:salt_control_size_ram_openstack_dns}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_dns}
           net_profile: ${_param:salt_control_size_net_profile_openstack_dns}
+          image_layout: ${_param:salt_control_size_image_layout_openstack_dns}
         openstack.telemetry:
           cpu: ${_param:salt_control_size_cpu_openstack_telemetry}
           ram: ${_param:salt_control_size_ram_openstack_telemetry}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_telemetry}
           net_profile: ${_param:salt_control_size_net_profile_openstack_telemetry}
+          image_layout: ${_param:salt_control_size_image_layout_openstack_telemetry}
         openstack.barbican:
           cpu: ${_param:salt_control_size_cpu_openstack_barbican}
           ram: ${_param:salt_control_size_ram_openstack_barbican}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_barbican}
           net_profile: ${_param:salt_control_size_net_profile_openstack_barbican}
+          image_layout: ${_param:salt_control_size_image_layout_openstack_barbican}
         openstack.baremetal:
           cpu: ${_param:salt_control_size_cpu_openstack_baremetal}
           ram: ${_param:salt_control_size_ram_openstack_baremetal}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_baremetal}
-          net_profile: ${_param:salt_control_size_net_profile_openstack_baremetal}
\ No newline at end of file
+          net_profile: ${_param:salt_control_size_net_profile_openstack_baremetal}
+          image_layout: ${_param:salt_control_size_image_layout_openstack_baremetal}
diff --git a/salt/control/sizes/openstack/medium.yml b/salt/control/sizes/openstack/medium.yml
index 4ff4570..cadaa79 100644
--- a/salt/control/sizes/openstack/medium.yml
+++ b/salt/control/sizes/openstack/medium.yml
@@ -48,48 +48,58 @@
           ram: ${_param:salt_control_size_ram_openstack_control}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_control}
           net_profile: ${_param:salt_control_size_net_profile_openstack_control}
+          image_layout: ${_param:salt_control_size_image_layout_openstack_control}
         openstack.database:
           cpu: ${_param:salt_control_size_cpu_openstack_database}
           ram: ${_param:salt_control_size_ram_openstack_database}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_database}
           net_profile: ${_param:salt_control_size_net_profile_openstack_database}
+          image_layout: ${_param:salt_control_size_image_layout_openstack_database}
         openstack.message_queue:
           cpu: ${_param:salt_control_size_cpu_openstack_message_queue}
           ram: ${_param:salt_control_size_ram_openstack_message_queue}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_message_queue}
           net_profile: ${_param:salt_control_size_net_profile_openstack_message_queue}
+          image_layout: ${_param:salt_control_size_image_layout_openstack_message_queue}
         openstack.proxy:
           cpu: ${_param:salt_control_size_cpu_openstack_proxy}
           ram: ${_param:salt_control_size_ram_openstack_proxy}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_proxy}
           net_profile: ${_param:salt_control_size_net_profile_openstack_proxy}
+          image_layout: ${_param:salt_control_size_image_layout_openstack_proxy}
         openstack.upgrade:
           cpu: ${_param:salt_control_size_cpu_openstack_upgrade}
           ram: ${_param:salt_control_size_ram_openstack_upgrade}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_upgrade}
           net_profile: ${_param:salt_control_size_net_profile_openstack_upgrade}
+          image_layout: ${_param:salt_control_size_image_layout_openstack_upgrade}
         openstack.share:
           cpu: ${_param:salt_control_size_cpu_openstack_share}
           ram: ${_param:salt_control_size_ram_openstack_share}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_share}
           net_profile: ${_param:salt_control_size_net_profile_openstack_share}
+          image_layout: ${_param:salt_control_size_image_layout_openstack_share}
         openstack.dns:
           cpu: ${_param:salt_control_size_cpu_openstack_dns}
           ram: ${_param:salt_control_size_ram_openstack_dns}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_dns}
           net_profile: ${_param:salt_control_size_net_profile_openstack_dns}
+          image_layout: ${_param:salt_control_size_image_layout_openstack_dns}
         openstack.telemetry:
           cpu: ${_param:salt_control_size_cpu_openstack_telemetry}
           ram: ${_param:salt_control_size_ram_openstack_telemetry}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_telemetry}
           net_profile: ${_param:salt_control_size_net_profile_openstack_telemetry}
+          image_layout: ${_param:salt_control_size_image_layout_openstack_telemetry}
         openstack.barbican:
           cpu: ${_param:salt_control_size_cpu_openstack_barbican}
           ram: ${_param:salt_control_size_ram_openstack_barbican}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_barbican}
           net_profile: ${_param:salt_control_size_net_profile_openstack_barbican}
+          image_layout: ${_param:salt_control_size_image_layout_openstack_barbican}
         openstack.baremetal:
           cpu: ${_param:salt_control_size_cpu_openstack_baremetal}
           ram: ${_param:salt_control_size_ram_openstack_baremetal}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_baremetal}
-          net_profile: ${_param:salt_control_size_net_profile_openstack_baremetal}
\ No newline at end of file
+          net_profile: ${_param:salt_control_size_net_profile_openstack_baremetal}
+          image_layout: ${_param:salt_control_size_image_layout_openstack_baremetal}
diff --git a/salt/control/sizes/openstack/minimal.yml b/salt/control/sizes/openstack/minimal.yml
index e24a597..b3b2a85 100644
--- a/salt/control/sizes/openstack/minimal.yml
+++ b/salt/control/sizes/openstack/minimal.yml
@@ -48,48 +48,58 @@
           ram: ${_param:salt_control_size_ram_openstack_control}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_control}
           net_profile: ${_param:salt_control_size_net_profile_openstack_control}
+          image_layout: ${_param:salt_control_size_image_layout_openstack_control}
         openstack.database:
           cpu: ${_param:salt_control_size_cpu_openstack_database}
           ram: ${_param:salt_control_size_ram_openstack_database}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_database}
           net_profile: ${_param:salt_control_size_net_profile_openstack_database}
+          image_layout: ${_param:salt_control_size_image_layout_openstack_database}
         openstack.message_queue:
           cpu: ${_param:salt_control_size_cpu_openstack_message_queue}
           ram: ${_param:salt_control_size_ram_openstack_message_queue}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_message_queue}
           net_profile: ${_param:salt_control_size_net_profile_openstack_message_queue}
+          image_layout: ${_param:salt_control_size_image_layout_openstack_message_queue}
         openstack.proxy:
           cpu: ${_param:salt_control_size_cpu_openstack_proxy}
           ram: ${_param:salt_control_size_ram_openstack_proxy}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_proxy}
           net_profile: ${_param:salt_control_size_net_profile_openstack_proxy}
+          image_layout: ${_param:salt_control_size_image_layout_openstack_proxy}
         openstack.upgrade:
           cpu: ${_param:salt_control_size_cpu_openstack_upgrade}
           ram: ${_param:salt_control_size_ram_openstack_upgrade}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_upgrade}
           net_profile: ${_param:salt_control_size_net_profile_openstack_upgrade}
+          image_layout: ${_param:salt_control_size_image_layout_openstack_upgrade}
         openstack.share:
           cpu: ${_param:salt_control_size_cpu_openstack_share}
           ram: ${_param:salt_control_size_ram_openstack_share}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_share}
           net_profile: ${_param:salt_control_size_net_profile_openstack_share}
+          image_layout: ${_param:salt_control_size_image_layout_openstack_share}
         openstack.dns:
           cpu: ${_param:salt_control_size_cpu_openstack_dns}
           ram: ${_param:salt_control_size_ram_openstack_dns}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_dns}
           net_profile: ${_param:salt_control_size_net_profile_openstack_dns}
+          image_layout: ${_param:salt_control_size_image_layout_openstack_dns}
         openstack.telemetry:
           cpu: ${_param:salt_control_size_cpu_openstack_telemetry}
           ram: ${_param:salt_control_size_ram_openstack_telemetry}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_telemetry}
           net_profile: ${_param:salt_control_size_net_profile_openstack_telemetry}
+          image_layout: ${_param:salt_control_size_image_layout_openstack_telemetry}
         openstack.barbican:
           cpu: ${_param:salt_control_size_cpu_openstack_barbican}
           ram: ${_param:salt_control_size_ram_openstack_barbican}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_barbican}
           net_profile: ${_param:salt_control_size_net_profile_openstack_barbican}
+          image_layout: ${_param:salt_control_size_image_layout_openstack_barbican}
         openstack.baremetal:
           cpu: ${_param:salt_control_size_cpu_openstack_baremetal}
           ram: ${_param:salt_control_size_ram_openstack_baremetal}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_baremetal}
-          net_profile: ${_param:salt_control_size_net_profile_openstack_baremetal}
\ No newline at end of file
+          net_profile: ${_param:salt_control_size_net_profile_openstack_baremetal}
+          image_layout: ${_param:salt_control_size_image_layout_openstack_baremetal}
diff --git a/salt/control/sizes/openstack/small.yml b/salt/control/sizes/openstack/small.yml
index 32b2113..ab3700a 100644
--- a/salt/control/sizes/openstack/small.yml
+++ b/salt/control/sizes/openstack/small.yml
@@ -48,48 +48,58 @@
           ram: ${_param:salt_control_size_ram_openstack_control}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_control}
           net_profile: ${_param:salt_control_size_net_profile_openstack_control}
+          image_layout: ${_param:salt_control_size_image_layout_openstack_control}
         openstack.database:
           cpu: ${_param:salt_control_size_cpu_openstack_database}
           ram: ${_param:salt_control_size_ram_openstack_database}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_database}
           net_profile: ${_param:salt_control_size_net_profile_openstack_database}
+          image_layout: ${_param:salt_control_size_image_layout_openstack_database}
         openstack.message_queue:
           cpu: ${_param:salt_control_size_cpu_openstack_message_queue}
           ram: ${_param:salt_control_size_ram_openstack_message_queue}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_message_queue}
           net_profile: ${_param:salt_control_size_net_profile_openstack_message_queue}
+          image_layout: ${_param:salt_control_size_image_layout_openstack_message_queue}
         openstack.proxy:
           cpu: ${_param:salt_control_size_cpu_openstack_proxy}
           ram: ${_param:salt_control_size_ram_openstack_proxy}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_proxy}
           net_profile: ${_param:salt_control_size_net_profile_openstack_proxy}
+          image_layout: ${_param:salt_control_size_image_layout_openstack_proxy}
         openstack.upgrade:
           cpu: ${_param:salt_control_size_cpu_openstack_upgrade}
           ram: ${_param:salt_control_size_ram_openstack_upgrade}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_upgrade}
           net_profile: ${_param:salt_control_size_net_profile_openstack_upgrade}
+          image_layout: ${_param:salt_control_size_image_layout_openstack_upgrade}
         openstack.share:
           cpu: ${_param:salt_control_size_cpu_openstack_share}
           ram: ${_param:salt_control_size_ram_openstack_share}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_share}
           net_profile: ${_param:salt_control_size_net_profile_openstack_share}
+          image_layout: ${_param:salt_control_size_image_layout_openstack_share}
         openstack.dns:
           cpu: ${_param:salt_control_size_cpu_openstack_dns}
           ram: ${_param:salt_control_size_ram_openstack_dns}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_dns}
           net_profile: ${_param:salt_control_size_net_profile_openstack_dns}
+          image_layout: ${_param:salt_control_size_image_layout_openstack_dns}
         openstack.telemetry:
           cpu: ${_param:salt_control_size_cpu_openstack_telemetry}
           ram: ${_param:salt_control_size_ram_openstack_telemetry}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_telemetry}
           net_profile: ${_param:salt_control_size_net_profile_openstack_telemetry}
+          image_layout: ${_param:salt_control_size_image_layout_openstack_telemetry}
         openstack.barbican:
           cpu: ${_param:salt_control_size_cpu_openstack_barbican}
           ram: ${_param:salt_control_size_ram_openstack_barbican}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_barbican}
           net_profile: ${_param:salt_control_size_net_profile_openstack_barbican}
+          image_layout: ${_param:salt_control_size_image_layout_openstack_barbican}
         openstack.baremetal:
           cpu: ${_param:salt_control_size_cpu_openstack_baremetal}
           ram: ${_param:salt_control_size_ram_openstack_baremetal}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_baremetal}
-          net_profile: ${_param:salt_control_size_net_profile_openstack_baremetal}
\ No newline at end of file
+          net_profile: ${_param:salt_control_size_net_profile_openstack_baremetal}
+          image_layout: ${_param:salt_control_size_image_layout_openstack_baremetal}
diff --git a/salt/control/sizes/ovs/compact.yml b/salt/control/sizes/ovs/compact.yml
index c5d69a0..0b822b4 100644
--- a/salt/control/sizes/ovs/compact.yml
+++ b/salt/control/sizes/ovs/compact.yml
@@ -11,4 +11,5 @@
           cpu: ${_param:salt_control_size_cpu_openstack_gateway}
           ram: ${_param:salt_control_size_ram_openstack_gateway}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_gateway}
-          net_profile: ${_param:salt_control_size_net_profile_openstack_gateway}
\ No newline at end of file
+          net_profile: ${_param:salt_control_size_net_profile_openstack_gateway}
+          image_layout: ${_param:salt_control_size_image_layout_openstack_gateway}
diff --git a/salt/control/sizes/ovs/minimal.yml b/salt/control/sizes/ovs/minimal.yml
index c5d69a0..0b822b4 100644
--- a/salt/control/sizes/ovs/minimal.yml
+++ b/salt/control/sizes/ovs/minimal.yml
@@ -11,4 +11,5 @@
           cpu: ${_param:salt_control_size_cpu_openstack_gateway}
           ram: ${_param:salt_control_size_ram_openstack_gateway}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_gateway}
-          net_profile: ${_param:salt_control_size_net_profile_openstack_gateway}
\ No newline at end of file
+          net_profile: ${_param:salt_control_size_net_profile_openstack_gateway}
+          image_layout: ${_param:salt_control_size_image_layout_openstack_gateway}
diff --git a/salt/control/sizes/ovs/small.yml b/salt/control/sizes/ovs/small.yml
index c5d69a0..0b822b4 100644
--- a/salt/control/sizes/ovs/small.yml
+++ b/salt/control/sizes/ovs/small.yml
@@ -11,4 +11,5 @@
           cpu: ${_param:salt_control_size_cpu_openstack_gateway}
           ram: ${_param:salt_control_size_ram_openstack_gateway}
           disk_profile: ${_param:salt_control_size_disk_profile_openstack_gateway}
-          net_profile: ${_param:salt_control_size_net_profile_openstack_gateway}
\ No newline at end of file
+          net_profile: ${_param:salt_control_size_net_profile_openstack_gateway}
+          image_layout: ${_param:salt_control_size_image_layout_openstack_gateway}
diff --git a/salt/control/sizes/stacklight.yml b/salt/control/sizes/stacklight.yml
index c7b1875..acdc835 100644
--- a/salt/control/sizes/stacklight.yml
+++ b/salt/control/sizes/stacklight.yml
@@ -20,13 +20,16 @@
           ram: ${_param:salt_control_size_ram_stacklight_log}
           disk_profile: ${_param:salt_control_size_disk_profile_stacklight_log}
           net_profile: ${_param:salt_control_size_net_profile_stacklight_log}
+          image_layout: ${_param:salt_control_size_image_layout_stacklight_log}
         stacklight.server:
           cpu: ${_param:salt_control_size_cpu_stacklight_server}
           ram: ${_param:salt_control_size_ram_stacklight_server}
           disk_profile: ${_param:salt_control_size_disk_profile_stacklight_server}
           net_profile: ${_param:salt_control_size_net_profile_stacklight_server}
+          image_layout: ${_param:salt_control_size_image_layout_stacklight_server}
         stacklight.telemetry:
           cpu: ${_param:salt_control_size_cpu_stacklight_telemetry}
           ram: ${_param:salt_control_size_ram_stacklight_telemetry}
           disk_profile: ${_param:salt_control_size_disk_profile_stacklight_telemetry}
-          net_profile: ${_param:salt_control_size_net_profile_stacklight_telemetry}
\ No newline at end of file
+          net_profile: ${_param:salt_control_size_net_profile_stacklight_telemetry}
+          image_layout: ${_param:salt_control_size_image_layout_stacklight_telemetry}
diff --git a/salt/control/sizes/stacklight/compact.yml b/salt/control/sizes/stacklight/compact.yml
index d4533d7..0bc3a3a 100644
--- a/salt/control/sizes/stacklight/compact.yml
+++ b/salt/control/sizes/stacklight/compact.yml
@@ -20,13 +20,16 @@
           ram: ${_param:salt_control_size_ram_stacklight_log}
           disk_profile: ${_param:salt_control_size_disk_profile_stacklight_log}
           net_profile: ${_param:salt_control_size_net_profile_stacklight_log}
+          image_layout: ${_param:salt_control_size_image_layout_stacklight_log}
         stacklight.server:
           cpu: ${_param:salt_control_size_cpu_stacklight_server}
           ram: ${_param:salt_control_size_ram_stacklight_server}
           disk_profile: ${_param:salt_control_size_disk_profile_stacklight_server}
           net_profile: ${_param:salt_control_size_net_profile_stacklight_server}
+          image_layout: ${_param:salt_control_size_image_layout_stacklight_server}
         stacklight.telemetry:
           cpu: ${_param:salt_control_size_cpu_stacklight_telemetry}
           ram: ${_param:salt_control_size_ram_stacklight_telemetry}
           disk_profile: ${_param:salt_control_size_disk_profile_stacklight_telemetry}
-          net_profile: ${_param:salt_control_size_net_profile_stacklight_telemetry}
\ No newline at end of file
+          net_profile: ${_param:salt_control_size_net_profile_stacklight_telemetry}
+          image_layout: ${_param:salt_control_size_image_layout_stacklight_telemetry}
diff --git a/salt/control/sizes/stacklight/large.yml b/salt/control/sizes/stacklight/large.yml
index fc225fb..575e441 100644
--- a/salt/control/sizes/stacklight/large.yml
+++ b/salt/control/sizes/stacklight/large.yml
@@ -20,13 +20,16 @@
           ram: ${_param:salt_control_size_ram_stacklight_log}
           disk_profile: ${_param:salt_control_size_disk_profile_stacklight_log}
           net_profile: ${_param:salt_control_size_net_profile_stacklight_log}
+          image_layout: ${_param:salt_control_size_image_layout_stacklight_log}
         stacklight.server:
           cpu: ${_param:salt_control_size_cpu_stacklight_server}
           ram: ${_param:salt_control_size_ram_stacklight_server}
           disk_profile: ${_param:salt_control_size_disk_profile_stacklight_server}
           net_profile: ${_param:salt_control_size_net_profile_stacklight_server}
+          image_layout: ${_param:salt_control_size_image_layout_stacklight_server}
         stacklight.telemetry:
           cpu: ${_param:salt_control_size_cpu_stacklight_telemetry}
           ram: ${_param:salt_control_size_ram_stacklight_telemetry}
           disk_profile: ${_param:salt_control_size_disk_profile_stacklight_telemetry}
-          net_profile: ${_param:salt_control_size_net_profile_stacklight_telemetry}
\ No newline at end of file
+          net_profile: ${_param:salt_control_size_net_profile_stacklight_telemetry}
+          image_layout: ${_param:salt_control_size_image_layout_stacklight_telemetry}
diff --git a/salt/control/sizes/stacklight/medium.yml b/salt/control/sizes/stacklight/medium.yml
index f41ffd2..16a19e1 100644
--- a/salt/control/sizes/stacklight/medium.yml
+++ b/salt/control/sizes/stacklight/medium.yml
@@ -20,13 +20,16 @@
           ram: ${_param:salt_control_size_ram_stacklight_log}
           disk_profile: ${_param:salt_control_size_disk_profile_stacklight_log}
           net_profile: ${_param:salt_control_size_net_profile_stacklight_log}
+          image_layout: ${_param:salt_control_size_image_layout_stacklight_log}
         stacklight.server:
           cpu: ${_param:salt_control_size_cpu_stacklight_server}
           ram: ${_param:salt_control_size_ram_stacklight_server}
           disk_profile: ${_param:salt_control_size_disk_profile_stacklight_server}
           net_profile: ${_param:salt_control_size_net_profile_stacklight_server}
+          image_layout: ${_param:salt_control_size_image_layout_stacklight_server}
         stacklight.telemetry:
           cpu: ${_param:salt_control_size_cpu_stacklight_telemetry}
           ram: ${_param:salt_control_size_ram_stacklight_telemetry}
           disk_profile: ${_param:salt_control_size_disk_profile_stacklight_telemetry}
-          net_profile: ${_param:salt_control_size_net_profile_stacklight_telemetry}
\ No newline at end of file
+          net_profile: ${_param:salt_control_size_net_profile_stacklight_telemetry}
+          image_layout: ${_param:salt_control_size_image_layout_stacklight_telemetry}
diff --git a/salt/control/sizes/stacklight/minimal.yml b/salt/control/sizes/stacklight/minimal.yml
index 5013907..d6256cf 100644
--- a/salt/control/sizes/stacklight/minimal.yml
+++ b/salt/control/sizes/stacklight/minimal.yml
@@ -20,13 +20,16 @@
           ram: ${_param:salt_control_size_ram_stacklight_log}
           disk_profile: ${_param:salt_control_size_disk_profile_stacklight_log}
           net_profile: ${_param:salt_control_size_net_profile_stacklight_log}
+          image_layout: ${_param:salt_control_size_image_layout_stacklight_log}
         stacklight.server:
           cpu: ${_param:salt_control_size_cpu_stacklight_server}
           ram: ${_param:salt_control_size_ram_stacklight_server}
           disk_profile: ${_param:salt_control_size_disk_profile_stacklight_server}
           net_profile: ${_param:salt_control_size_net_profile_stacklight_server}
+          image_layout: ${_param:salt_control_size_image_layout_stacklight_server}
         stacklight.telemetry:
           cpu: ${_param:salt_control_size_cpu_stacklight_telemetry}
           ram: ${_param:salt_control_size_ram_stacklight_telemetry}
           disk_profile: ${_param:salt_control_size_disk_profile_stacklight_telemetry}
-          net_profile: ${_param:salt_control_size_net_profile_stacklight_telemetry}
\ No newline at end of file
+          net_profile: ${_param:salt_control_size_net_profile_stacklight_telemetry}
+          image_layout: ${_param:salt_control_size_image_layout_stacklight_telemetry}
diff --git a/salt/control/sizes/stacklight/small.yml b/salt/control/sizes/stacklight/small.yml
index 204432a..4ade458 100644
--- a/salt/control/sizes/stacklight/small.yml
+++ b/salt/control/sizes/stacklight/small.yml
@@ -20,13 +20,16 @@
           ram: ${_param:salt_control_size_ram_stacklight_log}
           disk_profile: ${_param:salt_control_size_disk_profile_stacklight_log}
           net_profile: ${_param:salt_control_size_net_profile_stacklight_log}
+          image_layout: ${_param:salt_control_size_image_layout_stacklight_log}
         stacklight.server:
           cpu: ${_param:salt_control_size_cpu_stacklight_server}
           ram: ${_param:salt_control_size_ram_stacklight_server}
           disk_profile: ${_param:salt_control_size_disk_profile_stacklight_server}
           net_profile: ${_param:salt_control_size_net_profile_stacklight_server}
+          image_layout: ${_param:salt_control_size_image_layout_stacklight_server}
         stacklight.telemetry:
           cpu: ${_param:salt_control_size_cpu_stacklight_telemetry}
           ram: ${_param:salt_control_size_ram_stacklight_telemetry}
           disk_profile: ${_param:salt_control_size_disk_profile_stacklight_telemetry}
-          net_profile: ${_param:salt_control_size_net_profile_stacklight_telemetry}
\ No newline at end of file
+          net_profile: ${_param:salt_control_size_net_profile_stacklight_telemetry}
+          image_layout: ${_param:salt_control_size_image_layout_stacklight_telemetry}