diff --git a/tcp_tests/templates/cookied-cicd-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml b/tcp_tests/templates/cookied-cicd-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
index 0591182..d00a165 100644
--- a/tcp_tests/templates/cookied-cicd-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
+++ b/tcp_tests/templates/cookied-cicd-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
@@ -133,6 +133,28 @@
             power_pass: ==IPMI_PASS==
             power_type: ipmi
             power_user: ==IPMI_USER==
+          disk_layout:
+            type: custom
+            bootable_device: sda
+            disk:
+              vgroot:
+                devices:
+                  - sda
+                type: lvm
+                volume:
+                  root:
+                    mount: /
+                    size: 80G
+                    type: ext4
+              vgvar:
+                devices:
+                  - sdb
+                type: lvm
+                volume:
+                  var:
+                    mount: /var/
+                    size: 1T
+                    type: ext4
         kvm02: # #cz7049-kvm.host-telecom.com
           distro_series: "xenial"
           # hwe_kernel: "hwe-16.04"
@@ -149,6 +171,28 @@
             power_pass: ==IPMI_PASS==
             power_type: ipmi
             power_user: ==IPMI_USER==
+          disk_layout:
+            type: custom
+            bootable_device: sda
+            disk:
+              vgroot:
+                devices:
+                  - sda
+                type: lvm
+                volume:
+                  root:
+                    mount: /
+                    size: 80G
+                    type: ext4
+              vgvar:
+                devices:
+                  - sdb
+                type: lvm
+                volume:
+                  var:
+                    mount: /var/
+                    size: 1T
+                    type: ext4
         kvm03: # #cz7048-kvm.host-telecom.com
           distro_series: "xenial"
           # hwe_kernel: "hwe-16.04"
@@ -165,6 +209,28 @@
             power_pass: ==IPMI_PASS==
             power_type: ipmi
             power_user: ==IPMI_USER==
+          disk_layout:
+            type: custom
+            bootable_device: sda
+            disk:
+              vgroot:
+                devices:
+                  - sda
+                type: lvm
+                volume:
+                  root:
+                    mount: /
+                    size: 80G
+                    type: ext4
+              vgvar:
+                devices:
+                  - sdb
+                type: lvm
+                volume:
+                  var:
+                    mount: /var/
+                    size: 1T
+                    type: ext4
         gtw01: # #cz7052-kvm.host-telecom.com
           distro_series: "xenial"
           # hwe_kernel: "hwe-16.04"
@@ -335,7 +401,7 @@
   openldap_organisation: ${_param:cluster_name}
   openstack_benchmark_node01_address: 10.167.11.95
   openstack_benchmark_node01_hostname: bmk01
-  openstack_cluster_size: golden
+  openstack_cluster_size: compact
   openstack_compute_count: '2'
   openstack_compute_rack01_hostname: cmp
   openstack_compute_single_address_ranges: 10.167.11.3-10.167.11.4
diff --git a/tcp_tests/templates/cookied-cicd-ovs-maas/salt.yaml b/tcp_tests/templates/cookied-cicd-ovs-maas/salt.yaml
index 021401f..142d319 100644
--- a/tcp_tests/templates/cookied-cicd-ovs-maas/salt.yaml
+++ b/tcp_tests/templates/cookied-cicd-ovs-maas/salt.yaml
@@ -46,6 +46,12 @@
   retry: {count: 1, delay: 5}
   skip_fail: false
 
+- description: Assign drive partitions to machines
+  cmd: salt-call state.sls maas.machines.storage
+  node_name: {{ HOSTNAME_CFG01 }}
+  retry: {count: 1, delay: 5}
+  skip_fail: false
+
 - description: Remove all the salt-minions and re-register the cfg01 minion
   cmd: |
     salt-key -y -D;