diff --git a/tcp_tests/templates/cookied-bm-contrail40-nfv/underlay--user-data1604-hwe.yaml b/tcp_tests/templates/cookied-bm-contrail40-nfv/underlay--user-data1604-hwe.yaml
index d491551..ba69177 100644
--- a/tcp_tests/templates/cookied-bm-contrail40-nfv/underlay--user-data1604-hwe.yaml
+++ b/tcp_tests/templates/cookied-bm-contrail40-nfv/underlay--user-data1604-hwe.yaml
@@ -104,17 +104,17 @@
    - path: /usr/share/growlvm/image-layout.yml
      content: |
        root:
-         size: '50%VG'
+         size: '30%VG'
        home:
-         size: '100M'
+         size: '1G'
        var_log:
-         size: '15%VG'
+         size: '11%VG'
        var_log_audit:
-         size: '500M'
+         size: '5G'
        var_tmp:
-         size: '500M'
+         size: '11%VG'
        tmp:
-         size: '500M'
+         size: '5G'
      owner: root:root
 
   growpart:
diff --git a/tcp_tests/templates/cookied-bm-contrail40-nfv/underlay--user-data1604.yaml b/tcp_tests/templates/cookied-bm-contrail40-nfv/underlay--user-data1604.yaml
index eaa30dd..bdcd21d 100644
--- a/tcp_tests/templates/cookied-bm-contrail40-nfv/underlay--user-data1604.yaml
+++ b/tcp_tests/templates/cookied-bm-contrail40-nfv/underlay--user-data1604.yaml
@@ -100,17 +100,17 @@
    - path: /usr/share/growlvm/image-layout.yml
      content: |
        root:
-         size: '50%VG'
+         size: '30%VG'
        home:
-         size: '100M'
+         size: '1G'
        var_log:
-         size: '15%VG'
+         size: '11%VG'
        var_log_audit:
-         size: '500M'
+         size: '5G'
        var_tmp:
-         size: '500M'
+         size: '11%VG'
        tmp:
-         size: '500M'
+         size: '5G'
      owner: root:root
 
   growpart:
diff --git a/tcp_tests/templates/cookied-bm-contrail40/underlay--user-data1604-hwe.yaml b/tcp_tests/templates/cookied-bm-contrail40/underlay--user-data1604-hwe.yaml
index d491551..ba69177 100644
--- a/tcp_tests/templates/cookied-bm-contrail40/underlay--user-data1604-hwe.yaml
+++ b/tcp_tests/templates/cookied-bm-contrail40/underlay--user-data1604-hwe.yaml
@@ -104,17 +104,17 @@
    - path: /usr/share/growlvm/image-layout.yml
      content: |
        root:
-         size: '50%VG'
+         size: '30%VG'
        home:
-         size: '100M'
+         size: '1G'
        var_log:
-         size: '15%VG'
+         size: '11%VG'
        var_log_audit:
-         size: '500M'
+         size: '5G'
        var_tmp:
-         size: '500M'
+         size: '11%VG'
        tmp:
-         size: '500M'
+         size: '5G'
      owner: root:root
 
   growpart:
diff --git a/tcp_tests/templates/cookied-bm-contrail40/underlay--user-data1604.yaml b/tcp_tests/templates/cookied-bm-contrail40/underlay--user-data1604.yaml
index eaa30dd..bdcd21d 100644
--- a/tcp_tests/templates/cookied-bm-contrail40/underlay--user-data1604.yaml
+++ b/tcp_tests/templates/cookied-bm-contrail40/underlay--user-data1604.yaml
@@ -100,17 +100,17 @@
    - path: /usr/share/growlvm/image-layout.yml
      content: |
        root:
-         size: '50%VG'
+         size: '30%VG'
        home:
-         size: '100M'
+         size: '1G'
        var_log:
-         size: '15%VG'
+         size: '11%VG'
        var_log_audit:
-         size: '500M'
+         size: '5G'
        var_tmp:
-         size: '500M'
+         size: '11%VG'
        tmp:
-         size: '500M'
+         size: '5G'
      owner: root:root
 
   growpart:
diff --git a/tcp_tests/templates/cookied-bm-dpdk-pipeline/underlay--user-data1604-hwe.yaml b/tcp_tests/templates/cookied-bm-dpdk-pipeline/underlay--user-data1604-hwe.yaml
index e565677..44ae1f5 100644
--- a/tcp_tests/templates/cookied-bm-dpdk-pipeline/underlay--user-data1604-hwe.yaml
+++ b/tcp_tests/templates/cookied-bm-dpdk-pipeline/underlay--user-data1604-hwe.yaml
@@ -105,17 +105,17 @@
    - path: /usr/share/growlvm/image-layout.yml
      content: |
        root:
-         size: '50%VG'
+         size: '30%VG'
        home:
-         size: '100M'
+         size: '1G'
        var_log:
-         size: '15%VG'
+         size: '11%VG'
        var_log_audit:
-         size: '500M'
+         size: '5G'
        var_tmp:
-         size: '500M'
+         size: '11%VG'
        tmp:
-         size: '500M'
+         size: '5G'
      owner: root:root
 
   growpart:
diff --git a/tcp_tests/templates/cookied-bm-dpdk-pipeline/underlay--user-data1604.yaml b/tcp_tests/templates/cookied-bm-dpdk-pipeline/underlay--user-data1604.yaml
index 82b76ba..b39b37a 100644
--- a/tcp_tests/templates/cookied-bm-dpdk-pipeline/underlay--user-data1604.yaml
+++ b/tcp_tests/templates/cookied-bm-dpdk-pipeline/underlay--user-data1604.yaml
@@ -66,17 +66,17 @@
    - path: /usr/share/growlvm/image-layout.yml
      content: |
        root:
-         size: '50%VG'
+         size: '30%VG'
        home:
-         size: '100M'
+         size: '1G'
        var_log:
-         size: '15%VG'
+         size: '11%VG'
        var_log_audit:
-         size: '500M'
+         size: '5G'
        var_tmp:
-         size: '500M'
+         size: '11%VG'
        tmp:
-         size: '500M'
+         size: '5G'
      owner: root:root
 
   growpart:
diff --git a/tcp_tests/templates/cookied-bm-k8s-contrail/underlay--user-data1604-hwe-compute.yaml b/tcp_tests/templates/cookied-bm-k8s-contrail/underlay--user-data1604-hwe-compute.yaml
index 2ec1ffb..dd34ede 100644
--- a/tcp_tests/templates/cookied-bm-k8s-contrail/underlay--user-data1604-hwe-compute.yaml
+++ b/tcp_tests/templates/cookied-bm-k8s-contrail/underlay--user-data1604-hwe-compute.yaml
@@ -109,17 +109,17 @@
    - path: /usr/share/growlvm/image-layout.yml
      content: |
        root:
-         size: '50%VG'
+         size: '30%VG'
        home:
-         size: '100M'
+         size: '1G'
        var_log:
-         size: '15%VG'
+         size: '11%VG'
        var_log_audit:
-         size: '500M'
+         size: '5G'
        var_tmp:
-         size: '500M'
+         size: '11%VG'
        tmp:
-         size: '500M'
+         size: '5G'
      owner: root:root
 
   growpart:
diff --git a/tcp_tests/templates/cookied-bm-k8s-contrail/underlay--user-data1604.yaml b/tcp_tests/templates/cookied-bm-k8s-contrail/underlay--user-data1604.yaml
index 5aaf5a0..51fbc96 100644
--- a/tcp_tests/templates/cookied-bm-k8s-contrail/underlay--user-data1604.yaml
+++ b/tcp_tests/templates/cookied-bm-k8s-contrail/underlay--user-data1604.yaml
@@ -100,17 +100,17 @@
    - path: /usr/share/growlvm/image-layout.yml
      content: |
        root:
-         size: '50%VG'
+         size: '30%VG'
        home:
-         size: '100M'
+         size: '1G'
        var_log:
-         size: '15%VG'
+         size: '11%VG'
        var_log_audit:
-         size: '500M'
+         size: '5G'
        var_tmp:
-         size: '500M'
+         size: '11%VG'
        tmp:
-         size: '500M'
+         size: '5G'
      owner: root:root
 
   growpart:
diff --git a/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/underlay--user-data1604-hwe.yaml b/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/underlay--user-data1604-hwe.yaml
index df0e48a..4983612 100644
--- a/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/underlay--user-data1604-hwe.yaml
+++ b/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/underlay--user-data1604-hwe.yaml
@@ -105,17 +105,17 @@
    - path: /usr/share/growlvm/image-layout.yml
      content: |
        root:
-         size: '50%VG'
+         size: '30%VG'
        home:
-         size: '100M'
+         size: '1G'
        var_log:
-         size: '15%VG'
+         size: '11%VG'
        var_log_audit:
-         size: '500M'
+         size: '5G'
        var_tmp:
-         size: '500M'
+         size: '11%VG'
        tmp:
-         size: '500M'
+         size: '5G'
      owner: root:root
 
   growpart:
diff --git a/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/underlay--user-data1604.yaml b/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/underlay--user-data1604.yaml
index 82b76ba..b39b37a 100644
--- a/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/underlay--user-data1604.yaml
+++ b/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/underlay--user-data1604.yaml
@@ -66,17 +66,17 @@
    - path: /usr/share/growlvm/image-layout.yml
      content: |
        root:
-         size: '50%VG'
+         size: '30%VG'
        home:
-         size: '100M'
+         size: '1G'
        var_log:
-         size: '15%VG'
+         size: '11%VG'
        var_log_audit:
-         size: '500M'
+         size: '5G'
        var_tmp:
-         size: '500M'
+         size: '11%VG'
        tmp:
-         size: '500M'
+         size: '5G'
      owner: root:root
 
   growpart:
diff --git a/tcp_tests/templates/cookied-bm-mcp-ovs-dpdk/underlay--user-data1604-hwe.yaml b/tcp_tests/templates/cookied-bm-mcp-ovs-dpdk/underlay--user-data1604-hwe.yaml
index e565677..44ae1f5 100644
--- a/tcp_tests/templates/cookied-bm-mcp-ovs-dpdk/underlay--user-data1604-hwe.yaml
+++ b/tcp_tests/templates/cookied-bm-mcp-ovs-dpdk/underlay--user-data1604-hwe.yaml
@@ -105,17 +105,17 @@
    - path: /usr/share/growlvm/image-layout.yml
      content: |
        root:
-         size: '50%VG'
+         size: '30%VG'
        home:
-         size: '100M'
+         size: '1G'
        var_log:
-         size: '15%VG'
+         size: '11%VG'
        var_log_audit:
-         size: '500M'
+         size: '5G'
        var_tmp:
-         size: '500M'
+         size: '11%VG'
        tmp:
-         size: '500M'
+         size: '5G'
      owner: root:root
 
   growpart:
diff --git a/tcp_tests/templates/cookied-bm-mcp-ovs-dpdk/underlay--user-data1604.yaml b/tcp_tests/templates/cookied-bm-mcp-ovs-dpdk/underlay--user-data1604.yaml
index 82b76ba..b39b37a 100644
--- a/tcp_tests/templates/cookied-bm-mcp-ovs-dpdk/underlay--user-data1604.yaml
+++ b/tcp_tests/templates/cookied-bm-mcp-ovs-dpdk/underlay--user-data1604.yaml
@@ -66,17 +66,17 @@
    - path: /usr/share/growlvm/image-layout.yml
      content: |
        root:
-         size: '50%VG'
+         size: '30%VG'
        home:
-         size: '100M'
+         size: '1G'
        var_log:
-         size: '15%VG'
+         size: '11%VG'
        var_log_audit:
-         size: '500M'
+         size: '5G'
        var_tmp:
-         size: '500M'
+         size: '11%VG'
        tmp:
-         size: '500M'
+         size: '5G'
      owner: root:root
 
   growpart:
diff --git a/tcp_tests/templates/cookied-bm-oc40-queens/underlay--user-data1604-hwe.yaml b/tcp_tests/templates/cookied-bm-oc40-queens/underlay--user-data1604-hwe.yaml
index d491551..ba69177 100644
--- a/tcp_tests/templates/cookied-bm-oc40-queens/underlay--user-data1604-hwe.yaml
+++ b/tcp_tests/templates/cookied-bm-oc40-queens/underlay--user-data1604-hwe.yaml
@@ -104,17 +104,17 @@
    - path: /usr/share/growlvm/image-layout.yml
      content: |
        root:
-         size: '50%VG'
+         size: '30%VG'
        home:
-         size: '100M'
+         size: '1G'
        var_log:
-         size: '15%VG'
+         size: '11%VG'
        var_log_audit:
-         size: '500M'
+         size: '5G'
        var_tmp:
-         size: '500M'
+         size: '11%VG'
        tmp:
-         size: '500M'
+         size: '5G'
      owner: root:root
 
   growpart:
diff --git a/tcp_tests/templates/cookied-bm-oc40-queens/underlay--user-data1604.yaml b/tcp_tests/templates/cookied-bm-oc40-queens/underlay--user-data1604.yaml
index eaa30dd..bdcd21d 100644
--- a/tcp_tests/templates/cookied-bm-oc40-queens/underlay--user-data1604.yaml
+++ b/tcp_tests/templates/cookied-bm-oc40-queens/underlay--user-data1604.yaml
@@ -100,17 +100,17 @@
    - path: /usr/share/growlvm/image-layout.yml
      content: |
        root:
-         size: '50%VG'
+         size: '30%VG'
        home:
-         size: '100M'
+         size: '1G'
        var_log:
-         size: '15%VG'
+         size: '11%VG'
        var_log_audit:
-         size: '500M'
+         size: '5G'
        var_tmp:
-         size: '500M'
+         size: '11%VG'
        tmp:
-         size: '500M'
+         size: '5G'
      owner: root:root
 
   growpart:
diff --git a/tcp_tests/templates/cookied-cicd-k8s-calico-sl/underlay--user-data1604-swp.yaml b/tcp_tests/templates/cookied-cicd-k8s-calico-sl/underlay--user-data1604-swp.yaml
index d3d97a4..81936a4 100644
--- a/tcp_tests/templates/cookied-cicd-k8s-calico-sl/underlay--user-data1604-swp.yaml
+++ b/tcp_tests/templates/cookied-cicd-k8s-calico-sl/underlay--user-data1604-swp.yaml
@@ -63,17 +63,17 @@
    - path: /usr/share/growlvm/image-layout.yml
      content: |
        root:
-         size: '50%VG'
+         size: '30%VG'
        home:
-         size: '100M'
+         size: '1G'
        var_log:
-         size: '15%VG'
+         size: '11%VG'
        var_log_audit:
-         size: '500M'
+         size: '5G'
        var_tmp:
-         size: '500M'
+         size: '11%VG'
        tmp:
-         size: '500M'
+         size: '5G'
      owner: root:root
 
   growpart:
diff --git a/tcp_tests/templates/cookied-cicd-k8s-calico-sl/underlay--user-data1604.yaml b/tcp_tests/templates/cookied-cicd-k8s-calico-sl/underlay--user-data1604.yaml
index 730382e..6451e34 100644
--- a/tcp_tests/templates/cookied-cicd-k8s-calico-sl/underlay--user-data1604.yaml
+++ b/tcp_tests/templates/cookied-cicd-k8s-calico-sl/underlay--user-data1604.yaml
@@ -63,17 +63,17 @@
    - path: /usr/share/growlvm/image-layout.yml
      content: |
        root:
-         size: '50%VG'
+         size: '30%VG'
        home:
-         size: '100M'
+         size: '1G'
        var_log:
-         size: '15%VG'
+         size: '11%VG'
        var_log_audit:
-         size: '500M'
+         size: '5G'
        var_tmp:
-         size: '500M'
+         size: '11%VG'
        tmp:
-         size: '500M'
+         size: '5G'
      owner: root:root
 
   growpart:
diff --git a/tcp_tests/templates/cookied-cicd-k8s-calico/underlay--user-data1604-swp.yaml b/tcp_tests/templates/cookied-cicd-k8s-calico/underlay--user-data1604-swp.yaml
index d3d97a4..81936a4 100644
--- a/tcp_tests/templates/cookied-cicd-k8s-calico/underlay--user-data1604-swp.yaml
+++ b/tcp_tests/templates/cookied-cicd-k8s-calico/underlay--user-data1604-swp.yaml
@@ -63,17 +63,17 @@
    - path: /usr/share/growlvm/image-layout.yml
      content: |
        root:
-         size: '50%VG'
+         size: '30%VG'
        home:
-         size: '100M'
+         size: '1G'
        var_log:
-         size: '15%VG'
+         size: '11%VG'
        var_log_audit:
-         size: '500M'
+         size: '5G'
        var_tmp:
-         size: '500M'
+         size: '11%VG'
        tmp:
-         size: '500M'
+         size: '5G'
      owner: root:root
 
   growpart:
diff --git a/tcp_tests/templates/cookied-cicd-k8s-calico/underlay--user-data1604.yaml b/tcp_tests/templates/cookied-cicd-k8s-calico/underlay--user-data1604.yaml
index 730382e..6451e34 100644
--- a/tcp_tests/templates/cookied-cicd-k8s-calico/underlay--user-data1604.yaml
+++ b/tcp_tests/templates/cookied-cicd-k8s-calico/underlay--user-data1604.yaml
@@ -63,17 +63,17 @@
    - path: /usr/share/growlvm/image-layout.yml
      content: |
        root:
-         size: '50%VG'
+         size: '30%VG'
        home:
-         size: '100M'
+         size: '1G'
        var_log:
-         size: '15%VG'
+         size: '11%VG'
        var_log_audit:
-         size: '500M'
+         size: '5G'
        var_tmp:
-         size: '500M'
+         size: '11%VG'
        tmp:
-         size: '500M'
+         size: '5G'
      owner: root:root
 
   growpart:
diff --git a/tcp_tests/templates/cookied-cicd-k8s-genie/underlay--user-data1604-swp.yaml b/tcp_tests/templates/cookied-cicd-k8s-genie/underlay--user-data1604-swp.yaml
index d3d97a4..81936a4 100644
--- a/tcp_tests/templates/cookied-cicd-k8s-genie/underlay--user-data1604-swp.yaml
+++ b/tcp_tests/templates/cookied-cicd-k8s-genie/underlay--user-data1604-swp.yaml
@@ -63,17 +63,17 @@
    - path: /usr/share/growlvm/image-layout.yml
      content: |
        root:
-         size: '50%VG'
+         size: '30%VG'
        home:
-         size: '100M'
+         size: '1G'
        var_log:
-         size: '15%VG'
+         size: '11%VG'
        var_log_audit:
-         size: '500M'
+         size: '5G'
        var_tmp:
-         size: '500M'
+         size: '11%VG'
        tmp:
-         size: '500M'
+         size: '5G'
      owner: root:root
 
   growpart:
diff --git a/tcp_tests/templates/cookied-cicd-k8s-genie/underlay--user-data1604.yaml b/tcp_tests/templates/cookied-cicd-k8s-genie/underlay--user-data1604.yaml
index 730382e..6451e34 100644
--- a/tcp_tests/templates/cookied-cicd-k8s-genie/underlay--user-data1604.yaml
+++ b/tcp_tests/templates/cookied-cicd-k8s-genie/underlay--user-data1604.yaml
@@ -63,17 +63,17 @@
    - path: /usr/share/growlvm/image-layout.yml
      content: |
        root:
-         size: '50%VG'
+         size: '30%VG'
        home:
-         size: '100M'
+         size: '1G'
        var_log:
-         size: '15%VG'
+         size: '11%VG'
        var_log_audit:
-         size: '500M'
+         size: '5G'
        var_tmp:
-         size: '500M'
+         size: '11%VG'
        tmp:
-         size: '500M'
+         size: '5G'
      owner: root:root
 
   growpart:
diff --git a/tcp_tests/templates/cookied-cicd-pike-dpdk/underlay--user-data1604-swp.yaml b/tcp_tests/templates/cookied-cicd-pike-dpdk/underlay--user-data1604-swp.yaml
index d3d97a4..81936a4 100644
--- a/tcp_tests/templates/cookied-cicd-pike-dpdk/underlay--user-data1604-swp.yaml
+++ b/tcp_tests/templates/cookied-cicd-pike-dpdk/underlay--user-data1604-swp.yaml
@@ -63,17 +63,17 @@
    - path: /usr/share/growlvm/image-layout.yml
      content: |
        root:
-         size: '50%VG'
+         size: '30%VG'
        home:
-         size: '100M'
+         size: '1G'
        var_log:
-         size: '15%VG'
+         size: '11%VG'
        var_log_audit:
-         size: '500M'
+         size: '5G'
        var_tmp:
-         size: '500M'
+         size: '11%VG'
        tmp:
-         size: '500M'
+         size: '5G'
      owner: root:root
 
   growpart:
diff --git a/tcp_tests/templates/cookied-cicd-pike-dvr-ceph/underlay--user-data1604.yaml b/tcp_tests/templates/cookied-cicd-pike-dvr-ceph/underlay--user-data1604.yaml
index d3d97a4..81936a4 100644
--- a/tcp_tests/templates/cookied-cicd-pike-dvr-ceph/underlay--user-data1604.yaml
+++ b/tcp_tests/templates/cookied-cicd-pike-dvr-ceph/underlay--user-data1604.yaml
@@ -63,17 +63,17 @@
    - path: /usr/share/growlvm/image-layout.yml
      content: |
        root:
-         size: '50%VG'
+         size: '30%VG'
        home:
-         size: '100M'
+         size: '1G'
        var_log:
-         size: '15%VG'
+         size: '11%VG'
        var_log_audit:
-         size: '500M'
+         size: '5G'
        var_tmp:
-         size: '500M'
+         size: '11%VG'
        tmp:
-         size: '500M'
+         size: '5G'
      owner: root:root
 
   growpart:
diff --git a/tcp_tests/templates/cookied-cicd-pike-dvr-sl/underlay--user-data1604-swp.yaml b/tcp_tests/templates/cookied-cicd-pike-dvr-sl/underlay--user-data1604-swp.yaml
index d3d97a4..81936a4 100644
--- a/tcp_tests/templates/cookied-cicd-pike-dvr-sl/underlay--user-data1604-swp.yaml
+++ b/tcp_tests/templates/cookied-cicd-pike-dvr-sl/underlay--user-data1604-swp.yaml
@@ -63,17 +63,17 @@
    - path: /usr/share/growlvm/image-layout.yml
      content: |
        root:
-         size: '50%VG'
+         size: '30%VG'
        home:
-         size: '100M'
+         size: '1G'
        var_log:
-         size: '15%VG'
+         size: '11%VG'
        var_log_audit:
-         size: '500M'
+         size: '5G'
        var_tmp:
-         size: '500M'
+         size: '11%VG'
        tmp:
-         size: '500M'
+         size: '5G'
      owner: root:root
 
   growpart:
diff --git a/tcp_tests/templates/cookied-cicd-pike-ovs-sl/underlay--user-data1604-swp.yaml b/tcp_tests/templates/cookied-cicd-pike-ovs-sl/underlay--user-data1604-swp.yaml
index e4a0299..5a4fc79 100644
--- a/tcp_tests/templates/cookied-cicd-pike-ovs-sl/underlay--user-data1604-swp.yaml
+++ b/tcp_tests/templates/cookied-cicd-pike-ovs-sl/underlay--user-data1604-swp.yaml
@@ -64,17 +64,17 @@
    - path: /usr/share/growlvm/image-layout.yml
      content: |
        root:
-         size: '50%VG'
+         size: '30%VG'
        home:
-         size: '100M'
+         size: '1G'
        var_log:
-         size: '15%VG'
+         size: '11%VG'
        var_log_audit:
-         size: '500M'
+         size: '5G'
        var_tmp:
-         size: '500M'
+         size: '11%VG'
        tmp:
-         size: '500M'
+         size: '5G'
      owner: root:root
 
   growpart:
diff --git a/tcp_tests/templates/cookied-cicd-queens-dvr-sl/underlay--user-data1604-swp.yaml b/tcp_tests/templates/cookied-cicd-queens-dvr-sl/underlay--user-data1604-swp.yaml
index d3d97a4..81936a4 100644
--- a/tcp_tests/templates/cookied-cicd-queens-dvr-sl/underlay--user-data1604-swp.yaml
+++ b/tcp_tests/templates/cookied-cicd-queens-dvr-sl/underlay--user-data1604-swp.yaml
@@ -63,17 +63,17 @@
    - path: /usr/share/growlvm/image-layout.yml
      content: |
        root:
-         size: '50%VG'
+         size: '30%VG'
        home:
-         size: '100M'
+         size: '1G'
        var_log:
-         size: '15%VG'
+         size: '11%VG'
        var_log_audit:
-         size: '500M'
+         size: '5G'
        var_tmp:
-         size: '500M'
+         size: '11%VG'
        tmp:
-         size: '500M'
+         size: '5G'
      owner: root:root
 
   growpart:
diff --git a/tcp_tests/templates/cookied-mcp-pike-dpdk/underlay--user-data1604.yaml b/tcp_tests/templates/cookied-mcp-pike-dpdk/underlay--user-data1604.yaml
index 1e12f74..f8b58f5 100644
--- a/tcp_tests/templates/cookied-mcp-pike-dpdk/underlay--user-data1604.yaml
+++ b/tcp_tests/templates/cookied-mcp-pike-dpdk/underlay--user-data1604.yaml
@@ -53,18 +53,17 @@
 
    - path: /usr/share/growlvm/image-layout.yml
      content: |
-       root:
-         size: '50%VG'
+        size: '30%VG'
        home:
-         size: '100M'
+         size: '1G'
        var_log:
-         size: '15%VG'
+         size: '11%VG'
        var_log_audit:
-         size: '500M'
+         size: '5G'
        var_tmp:
-         size: '500M'
+         size: '11%VG'
        tmp:
-         size: '500M'
+         size: '5G'
      owner: root:root
 
   growpart:
diff --git a/tcp_tests/templates/cookied-mcp-pike-dvr-ssl-barbican/underlay--user-data1604.yaml b/tcp_tests/templates/cookied-mcp-pike-dvr-ssl-barbican/underlay--user-data1604.yaml
index 1e12f74..fd1527a 100644
--- a/tcp_tests/templates/cookied-mcp-pike-dvr-ssl-barbican/underlay--user-data1604.yaml
+++ b/tcp_tests/templates/cookied-mcp-pike-dvr-ssl-barbican/underlay--user-data1604.yaml
@@ -54,17 +54,17 @@
    - path: /usr/share/growlvm/image-layout.yml
      content: |
        root:
-         size: '50%VG'
+         size: '30%VG'
        home:
-         size: '100M'
+         size: '1G'
        var_log:
-         size: '15%VG'
+         size: '11%VG'
        var_log_audit:
-         size: '500M'
+         size: '5G'
        var_tmp:
-         size: '500M'
+         size: '11%VG'
        tmp:
-         size: '500M'
+         size: '5G'
      owner: root:root
 
   growpart:
diff --git a/tcp_tests/templates/cookied-mcp-pike-dvr-ssl/underlay--user-data1604.yaml b/tcp_tests/templates/cookied-mcp-pike-dvr-ssl/underlay--user-data1604.yaml
index 1e12f74..fd1527a 100644
--- a/tcp_tests/templates/cookied-mcp-pike-dvr-ssl/underlay--user-data1604.yaml
+++ b/tcp_tests/templates/cookied-mcp-pike-dvr-ssl/underlay--user-data1604.yaml
@@ -54,17 +54,17 @@
    - path: /usr/share/growlvm/image-layout.yml
      content: |
        root:
-         size: '50%VG'
+         size: '30%VG'
        home:
-         size: '100M'
+         size: '1G'
        var_log:
-         size: '15%VG'
+         size: '11%VG'
        var_log_audit:
-         size: '500M'
+         size: '5G'
        var_tmp:
-         size: '500M'
+         size: '11%VG'
        tmp:
-         size: '500M'
+         size: '5G'
      owner: root:root
 
   growpart:
diff --git a/tcp_tests/templates/cookied-mcp-pike-dvr/underlay--user-data1604.yaml b/tcp_tests/templates/cookied-mcp-pike-dvr/underlay--user-data1604.yaml
index 1e12f74..fd1527a 100644
--- a/tcp_tests/templates/cookied-mcp-pike-dvr/underlay--user-data1604.yaml
+++ b/tcp_tests/templates/cookied-mcp-pike-dvr/underlay--user-data1604.yaml
@@ -54,17 +54,17 @@
    - path: /usr/share/growlvm/image-layout.yml
      content: |
        root:
-         size: '50%VG'
+         size: '30%VG'
        home:
-         size: '100M'
+         size: '1G'
        var_log:
-         size: '15%VG'
+         size: '11%VG'
        var_log_audit:
-         size: '500M'
+         size: '5G'
        var_tmp:
-         size: '500M'
+         size: '11%VG'
        tmp:
-         size: '500M'
+         size: '5G'
      owner: root:root
 
   growpart:
diff --git a/tcp_tests/templates/cookied-mcp-pike-ovs/underlay--user-data1604.yaml b/tcp_tests/templates/cookied-mcp-pike-ovs/underlay--user-data1604.yaml
index 1e12f74..fd1527a 100644
--- a/tcp_tests/templates/cookied-mcp-pike-ovs/underlay--user-data1604.yaml
+++ b/tcp_tests/templates/cookied-mcp-pike-ovs/underlay--user-data1604.yaml
@@ -54,17 +54,17 @@
    - path: /usr/share/growlvm/image-layout.yml
      content: |
        root:
-         size: '50%VG'
+         size: '30%VG'
        home:
-         size: '100M'
+         size: '1G'
        var_log:
-         size: '15%VG'
+         size: '11%VG'
        var_log_audit:
-         size: '500M'
+         size: '5G'
        var_tmp:
-         size: '500M'
+         size: '11%VG'
        tmp:
-         size: '500M'
+         size: '5G'
      owner: root:root
 
   growpart:
diff --git a/tcp_tests/templates/cookied-mcp-queens-dvr-ceph/underlay--user-data1604.yaml b/tcp_tests/templates/cookied-mcp-queens-dvr-ceph/underlay--user-data1604.yaml
index 1e12f74..fd1527a 100644
--- a/tcp_tests/templates/cookied-mcp-queens-dvr-ceph/underlay--user-data1604.yaml
+++ b/tcp_tests/templates/cookied-mcp-queens-dvr-ceph/underlay--user-data1604.yaml
@@ -54,17 +54,17 @@
    - path: /usr/share/growlvm/image-layout.yml
      content: |
        root:
-         size: '50%VG'
+         size: '30%VG'
        home:
-         size: '100M'
+         size: '1G'
        var_log:
-         size: '15%VG'
+         size: '11%VG'
        var_log_audit:
-         size: '500M'
+         size: '5G'
        var_tmp:
-         size: '500M'
+         size: '11%VG'
        tmp:
-         size: '500M'
+         size: '5G'
      owner: root:root
 
   growpart:
diff --git a/tcp_tests/templates/cookied-mcp-queens-dvr-ssl-barbican/underlay--user-data1604.yaml b/tcp_tests/templates/cookied-mcp-queens-dvr-ssl-barbican/underlay--user-data1604.yaml
index 1e12f74..fd1527a 100644
--- a/tcp_tests/templates/cookied-mcp-queens-dvr-ssl-barbican/underlay--user-data1604.yaml
+++ b/tcp_tests/templates/cookied-mcp-queens-dvr-ssl-barbican/underlay--user-data1604.yaml
@@ -54,17 +54,17 @@
    - path: /usr/share/growlvm/image-layout.yml
      content: |
        root:
-         size: '50%VG'
+         size: '30%VG'
        home:
-         size: '100M'
+         size: '1G'
        var_log:
-         size: '15%VG'
+         size: '11%VG'
        var_log_audit:
-         size: '500M'
+         size: '5G'
        var_tmp:
-         size: '500M'
+         size: '11%VG'
        tmp:
-         size: '500M'
+         size: '5G'
      owner: root:root
 
   growpart:
diff --git a/tcp_tests/templates/cookied-mcp-queens-dvr-ssl/underlay--user-data1604.yaml b/tcp_tests/templates/cookied-mcp-queens-dvr-ssl/underlay--user-data1604.yaml
index 1e12f74..fd1527a 100644
--- a/tcp_tests/templates/cookied-mcp-queens-dvr-ssl/underlay--user-data1604.yaml
+++ b/tcp_tests/templates/cookied-mcp-queens-dvr-ssl/underlay--user-data1604.yaml
@@ -54,17 +54,17 @@
    - path: /usr/share/growlvm/image-layout.yml
      content: |
        root:
-         size: '50%VG'
+         size: '30%VG'
        home:
-         size: '100M'
+         size: '1G'
        var_log:
-         size: '15%VG'
+         size: '11%VG'
        var_log_audit:
-         size: '500M'
+         size: '5G'
        var_tmp:
-         size: '500M'
+         size: '11%VG'
        tmp:
-         size: '500M'
+         size: '5G'
      owner: root:root
 
   growpart:
diff --git a/tcp_tests/templates/cookied-mcp-queens-dvr/underlay--user-data1604.yaml b/tcp_tests/templates/cookied-mcp-queens-dvr/underlay--user-data1604.yaml
index 1e12f74..fd1527a 100644
--- a/tcp_tests/templates/cookied-mcp-queens-dvr/underlay--user-data1604.yaml
+++ b/tcp_tests/templates/cookied-mcp-queens-dvr/underlay--user-data1604.yaml
@@ -54,17 +54,17 @@
    - path: /usr/share/growlvm/image-layout.yml
      content: |
        root:
-         size: '50%VG'
+         size: '30%VG'
        home:
-         size: '100M'
+         size: '1G'
        var_log:
-         size: '15%VG'
+         size: '11%VG'
        var_log_audit:
-         size: '500M'
+         size: '5G'
        var_tmp:
-         size: '500M'
+         size: '11%VG'
        tmp:
-         size: '500M'
+         size: '5G'
      owner: root:root
 
   growpart:
diff --git a/tcp_tests/templates/cookied-mcp-queens-ovs/underlay--user-data1604.yaml b/tcp_tests/templates/cookied-mcp-queens-ovs/underlay--user-data1604.yaml
index 1e12f74..fd1527a 100644
--- a/tcp_tests/templates/cookied-mcp-queens-ovs/underlay--user-data1604.yaml
+++ b/tcp_tests/templates/cookied-mcp-queens-ovs/underlay--user-data1604.yaml
@@ -54,17 +54,17 @@
    - path: /usr/share/growlvm/image-layout.yml
      content: |
        root:
-         size: '50%VG'
+         size: '30%VG'
        home:
-         size: '100M'
+         size: '1G'
        var_log:
-         size: '15%VG'
+         size: '11%VG'
        var_log_audit:
-         size: '500M'
+         size: '5G'
        var_tmp:
-         size: '500M'
+         size: '11%VG'
        tmp:
-         size: '500M'
+         size: '5G'
      owner: root:root
 
   growpart:
diff --git a/tcp_tests/templates/k8s-ha-calico/underlay--user-data1604.yaml b/tcp_tests/templates/k8s-ha-calico/underlay--user-data1604.yaml
index 67390f8..ec9df27 100644
--- a/tcp_tests/templates/k8s-ha-calico/underlay--user-data1604.yaml
+++ b/tcp_tests/templates/k8s-ha-calico/underlay--user-data1604.yaml
@@ -57,17 +57,17 @@
    - path: /usr/share/growlvm/image-layout.yml
      content: |
        root:
-         size: '50%VG'
+         size: '30%VG'
        home:
-         size: '100M'
+         size: '1G'
        var_log:
-         size: '15%VG'
+         size: '11%VG'
        var_log_audit:
-         size: '500M'
+         size: '5G'
        var_tmp:
-         size: '500M'
+         size: '11%VG'
        tmp:
-         size: '500M'
+         size: '5G'
      owner: root:root
 
   growpart:
diff --git a/tcp_tests/templates/k8s-ha-contrail/underlay--user-data1604.yaml b/tcp_tests/templates/k8s-ha-contrail/underlay--user-data1604.yaml
index 73e3e1f..d23efd2 100644
--- a/tcp_tests/templates/k8s-ha-contrail/underlay--user-data1604.yaml
+++ b/tcp_tests/templates/k8s-ha-contrail/underlay--user-data1604.yaml
@@ -80,17 +80,17 @@
    - path: /usr/share/growlvm/image-layout.yml
      content: |
        root:
-         size: '50%VG'
+         size: '30%VG'
        home:
-         size: '100M'
+         size: '1G'
        var_log:
-         size: '15%VG'
+         size: '11%VG'
        var_log_audit:
-         size: '500M'
+         size: '5G'
        var_tmp:
-         size: '500M'
+         size: '11%VG'
        tmp:
-         size: '500M'
+         size: '5G'
      owner: root:root
 
   growpart:
diff --git a/tcp_tests/templates/virtual-offline-pike-ovs-dpdk/underlay--user-data1604.yaml b/tcp_tests/templates/virtual-offline-pike-ovs-dpdk/underlay--user-data1604.yaml
index 1ef9a97..c5fc670 100644
--- a/tcp_tests/templates/virtual-offline-pike-ovs-dpdk/underlay--user-data1604.yaml
+++ b/tcp_tests/templates/virtual-offline-pike-ovs-dpdk/underlay--user-data1604.yaml
@@ -77,17 +77,17 @@
    - path: /usr/share/growlvm/image-layout.yml
      content: |
        root:
-         size: '50%VG'
+         size: '30%VG'
        home:
-         size: '100M'
+         size: '1G'
        var_log:
-         size: '15%VG'
+         size: '11%VG'
        var_log_audit:
-         size: '500M'
+         size: '5G'
        var_tmp:
-         size: '500M'
+         size: '11%VG'
        tmp:
-         size: '500M'
+         size: '5G'
      owner: root:root
 
   growpart:
diff --git a/tcp_tests/templates/virtual-offline-ssl/underlay--user-data1604.yaml b/tcp_tests/templates/virtual-offline-ssl/underlay--user-data1604.yaml
index 1ef9a97..c5fc670 100644
--- a/tcp_tests/templates/virtual-offline-ssl/underlay--user-data1604.yaml
+++ b/tcp_tests/templates/virtual-offline-ssl/underlay--user-data1604.yaml
@@ -77,17 +77,17 @@
    - path: /usr/share/growlvm/image-layout.yml
      content: |
        root:
-         size: '50%VG'
+         size: '30%VG'
        home:
-         size: '100M'
+         size: '1G'
        var_log:
-         size: '15%VG'
+         size: '11%VG'
        var_log_audit:
-         size: '500M'
+         size: '5G'
        var_tmp:
-         size: '500M'
+         size: '11%VG'
        tmp:
-         size: '500M'
+         size: '5G'
      owner: root:root
 
   growpart: