diff --git a/tcp_tests/templates/bm-cicd-pike-ovs-maas/underlay-userdata.yaml b/tcp_tests/templates/bm-cicd-pike-ovs-maas/underlay-userdata.yaml
index 567a445..bb6338c 100644
--- a/tcp_tests/templates/bm-cicd-pike-ovs-maas/underlay-userdata.yaml
+++ b/tcp_tests/templates/bm-cicd-pike-ovs-maas/underlay-userdata.yaml
@@ -20,7 +20,7 @@
     all: '| tee -a /var/log/cloud-init-output.log /dev/tty0'
 
 runcmd:
-   - if lvs vg0; then pvresize /dev/vda3; fi
+   - if lvs vg0; then pvresize $(pvdisplay -C -S vg_name=vg0 -o pv_name --noheadings | tail -n1); fi
    - if lvs vg0; then /usr/bin/growlvm.py --image-layout-file /usr/share/growlvm/image-layout.yml; fi
 
    - export TERM=linux
@@ -75,4 +75,7 @@
     devices:
       - '/'
       - '/dev/vda3'
+      - '/dev/vdb3'
+      - '/dev/vdc3'
+      - '/dev/vdd3'
     ignore_growroot_disabled: false
diff --git a/tcp_tests/templates/bm-cicd-queens-ovs-maas/underlay-userdata.yaml b/tcp_tests/templates/bm-cicd-queens-ovs-maas/underlay-userdata.yaml
index 567a445..bb6338c 100644
--- a/tcp_tests/templates/bm-cicd-queens-ovs-maas/underlay-userdata.yaml
+++ b/tcp_tests/templates/bm-cicd-queens-ovs-maas/underlay-userdata.yaml
@@ -20,7 +20,7 @@
     all: '| tee -a /var/log/cloud-init-output.log /dev/tty0'
 
 runcmd:
-   - if lvs vg0; then pvresize /dev/vda3; fi
+   - if lvs vg0; then pvresize $(pvdisplay -C -S vg_name=vg0 -o pv_name --noheadings | tail -n1); fi
    - if lvs vg0; then /usr/bin/growlvm.py --image-layout-file /usr/share/growlvm/image-layout.yml; fi
 
    - export TERM=linux
@@ -75,4 +75,7 @@
     devices:
       - '/'
       - '/dev/vda3'
+      - '/dev/vdb3'
+      - '/dev/vdc3'
+      - '/dev/vdd3'
     ignore_growroot_disabled: false
diff --git a/tcp_tests/templates/bm-e7-cicd-pike-odl-maas/underlay-userdata.yaml b/tcp_tests/templates/bm-e7-cicd-pike-odl-maas/underlay-userdata.yaml
index 567a445..bb6338c 100644
--- a/tcp_tests/templates/bm-e7-cicd-pike-odl-maas/underlay-userdata.yaml
+++ b/tcp_tests/templates/bm-e7-cicd-pike-odl-maas/underlay-userdata.yaml
@@ -20,7 +20,7 @@
     all: '| tee -a /var/log/cloud-init-output.log /dev/tty0'
 
 runcmd:
-   - if lvs vg0; then pvresize /dev/vda3; fi
+   - if lvs vg0; then pvresize $(pvdisplay -C -S vg_name=vg0 -o pv_name --noheadings | tail -n1); fi
    - if lvs vg0; then /usr/bin/growlvm.py --image-layout-file /usr/share/growlvm/image-layout.yml; fi
 
    - export TERM=linux
@@ -75,4 +75,7 @@
     devices:
       - '/'
       - '/dev/vda3'
+      - '/dev/vdb3'
+      - '/dev/vdc3'
+      - '/dev/vdd3'
     ignore_growroot_disabled: false
diff --git a/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/underlay-userdata.yaml b/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/underlay-userdata.yaml
index 567a445..bb6338c 100644
--- a/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/underlay-userdata.yaml
+++ b/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/underlay-userdata.yaml
@@ -20,7 +20,7 @@
     all: '| tee -a /var/log/cloud-init-output.log /dev/tty0'
 
 runcmd:
-   - if lvs vg0; then pvresize /dev/vda3; fi
+   - if lvs vg0; then pvresize $(pvdisplay -C -S vg_name=vg0 -o pv_name --noheadings | tail -n1); fi
    - if lvs vg0; then /usr/bin/growlvm.py --image-layout-file /usr/share/growlvm/image-layout.yml; fi
 
    - export TERM=linux
@@ -75,4 +75,7 @@
     devices:
       - '/'
       - '/dev/vda3'
+      - '/dev/vdb3'
+      - '/dev/vdc3'
+      - '/dev/vdd3'
     ignore_growroot_disabled: false
diff --git a/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/underlay-userdata.yaml b/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/underlay-userdata.yaml
index 567a445..bb6338c 100644
--- a/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/underlay-userdata.yaml
+++ b/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/underlay-userdata.yaml
@@ -20,7 +20,7 @@
     all: '| tee -a /var/log/cloud-init-output.log /dev/tty0'
 
 runcmd:
-   - if lvs vg0; then pvresize /dev/vda3; fi
+   - if lvs vg0; then pvresize $(pvdisplay -C -S vg_name=vg0 -o pv_name --noheadings | tail -n1); fi
    - if lvs vg0; then /usr/bin/growlvm.py --image-layout-file /usr/share/growlvm/image-layout.yml; fi
 
    - export TERM=linux
@@ -75,4 +75,7 @@
     devices:
       - '/'
       - '/dev/vda3'
+      - '/dev/vdb3'
+      - '/dev/vdc3'
+      - '/dev/vdd3'
     ignore_growroot_disabled: false
diff --git a/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/underlay-userdata.yaml b/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/underlay-userdata.yaml
index 567a445..bb6338c 100644
--- a/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/underlay-userdata.yaml
+++ b/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/underlay-userdata.yaml
@@ -20,7 +20,7 @@
     all: '| tee -a /var/log/cloud-init-output.log /dev/tty0'
 
 runcmd:
-   - if lvs vg0; then pvresize /dev/vda3; fi
+   - if lvs vg0; then pvresize $(pvdisplay -C -S vg_name=vg0 -o pv_name --noheadings | tail -n1); fi
    - if lvs vg0; then /usr/bin/growlvm.py --image-layout-file /usr/share/growlvm/image-layout.yml; fi
 
    - export TERM=linux
@@ -75,4 +75,7 @@
     devices:
       - '/'
       - '/dev/vda3'
+      - '/dev/vdb3'
+      - '/dev/vdc3'
+      - '/dev/vdd3'
     ignore_growroot_disabled: false
diff --git a/tcp_tests/templates/heat-cicd-pike-dvr-sl/underlay-userdata.yaml b/tcp_tests/templates/heat-cicd-pike-dvr-sl/underlay-userdata.yaml
index 763ee01..d998d47 100644
--- a/tcp_tests/templates/heat-cicd-pike-dvr-sl/underlay-userdata.yaml
+++ b/tcp_tests/templates/heat-cicd-pike-dvr-sl/underlay-userdata.yaml
@@ -20,7 +20,7 @@
     all: '| tee -a /var/log/cloud-init-output.log /dev/tty0'
 
 runcmd:
-   - if lvs vg0; then pvresize /dev/vda3; fi
+   - if lvs vg0; then pvresize $(pvdisplay -C -S vg_name=vg0 -o pv_name --noheadings | tail -n1); fi
    - if lvs vg0; then /usr/bin/growlvm.py --image-layout-file /usr/share/growlvm/image-layout.yml; fi
 
    - export TERM=linux
@@ -75,4 +75,7 @@
     devices:
       - '/'
       - '/dev/vda3'
+      - '/dev/vdb3'
+      - '/dev/vdc3'
+      - '/dev/vdd3'
     ignore_growroot_disabled: false
diff --git a/tcp_tests/templates/heat-cicd-queens-contrail41-sl/underlay-userdata.yaml b/tcp_tests/templates/heat-cicd-queens-contrail41-sl/underlay-userdata.yaml
index 763ee01..d998d47 100644
--- a/tcp_tests/templates/heat-cicd-queens-contrail41-sl/underlay-userdata.yaml
+++ b/tcp_tests/templates/heat-cicd-queens-contrail41-sl/underlay-userdata.yaml
@@ -20,7 +20,7 @@
     all: '| tee -a /var/log/cloud-init-output.log /dev/tty0'
 
 runcmd:
-   - if lvs vg0; then pvresize /dev/vda3; fi
+   - if lvs vg0; then pvresize $(pvdisplay -C -S vg_name=vg0 -o pv_name --noheadings | tail -n1); fi
    - if lvs vg0; then /usr/bin/growlvm.py --image-layout-file /usr/share/growlvm/image-layout.yml; fi
 
    - export TERM=linux
@@ -75,4 +75,7 @@
     devices:
       - '/'
       - '/dev/vda3'
+      - '/dev/vdb3'
+      - '/dev/vdc3'
+      - '/dev/vdd3'
     ignore_growroot_disabled: false
diff --git a/tcp_tests/templates/heat-cicd-queens-dvr-sl/underlay-userdata.yaml b/tcp_tests/templates/heat-cicd-queens-dvr-sl/underlay-userdata.yaml
index 763ee01..d998d47 100644
--- a/tcp_tests/templates/heat-cicd-queens-dvr-sl/underlay-userdata.yaml
+++ b/tcp_tests/templates/heat-cicd-queens-dvr-sl/underlay-userdata.yaml
@@ -20,7 +20,7 @@
     all: '| tee -a /var/log/cloud-init-output.log /dev/tty0'
 
 runcmd:
-   - if lvs vg0; then pvresize /dev/vda3; fi
+   - if lvs vg0; then pvresize $(pvdisplay -C -S vg_name=vg0 -o pv_name --noheadings | tail -n1); fi
    - if lvs vg0; then /usr/bin/growlvm.py --image-layout-file /usr/share/growlvm/image-layout.yml; fi
 
    - export TERM=linux
@@ -75,4 +75,7 @@
     devices:
       - '/'
       - '/dev/vda3'
+      - '/dev/vdb3'
+      - '/dev/vdc3'
+      - '/dev/vdd3'
     ignore_growroot_disabled: false
diff --git a/tcp_tests/templates/released-heat-cicd-pike-contrail41-sl/underlay-userdata.yaml b/tcp_tests/templates/released-heat-cicd-pike-contrail41-sl/underlay-userdata.yaml
index 763ee01..d998d47 100644
--- a/tcp_tests/templates/released-heat-cicd-pike-contrail41-sl/underlay-userdata.yaml
+++ b/tcp_tests/templates/released-heat-cicd-pike-contrail41-sl/underlay-userdata.yaml
@@ -20,7 +20,7 @@
     all: '| tee -a /var/log/cloud-init-output.log /dev/tty0'
 
 runcmd:
-   - if lvs vg0; then pvresize /dev/vda3; fi
+   - if lvs vg0; then pvresize $(pvdisplay -C -S vg_name=vg0 -o pv_name --noheadings | tail -n1); fi
    - if lvs vg0; then /usr/bin/growlvm.py --image-layout-file /usr/share/growlvm/image-layout.yml; fi
 
    - export TERM=linux
@@ -75,4 +75,7 @@
     devices:
       - '/'
       - '/dev/vda3'
+      - '/dev/vdb3'
+      - '/dev/vdc3'
+      - '/dev/vdd3'
     ignore_growroot_disabled: false
diff --git a/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/underlay-userdata.yaml b/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/underlay-userdata.yaml
index 763ee01..d998d47 100644
--- a/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/underlay-userdata.yaml
+++ b/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/underlay-userdata.yaml
@@ -20,7 +20,7 @@
     all: '| tee -a /var/log/cloud-init-output.log /dev/tty0'
 
 runcmd:
-   - if lvs vg0; then pvresize /dev/vda3; fi
+   - if lvs vg0; then pvresize $(pvdisplay -C -S vg_name=vg0 -o pv_name --noheadings | tail -n1); fi
    - if lvs vg0; then /usr/bin/growlvm.py --image-layout-file /usr/share/growlvm/image-layout.yml; fi
 
    - export TERM=linux
@@ -75,4 +75,7 @@
     devices:
       - '/'
       - '/dev/vda3'
+      - '/dev/vdb3'
+      - '/dev/vdc3'
+      - '/dev/vdd3'
     ignore_growroot_disabled: false
diff --git a/tcp_tests/templates/released-heat-cicd-queens-contrail41-sl/underlay-userdata.yaml b/tcp_tests/templates/released-heat-cicd-queens-contrail41-sl/underlay-userdata.yaml
index 763ee01..d998d47 100644
--- a/tcp_tests/templates/released-heat-cicd-queens-contrail41-sl/underlay-userdata.yaml
+++ b/tcp_tests/templates/released-heat-cicd-queens-contrail41-sl/underlay-userdata.yaml
@@ -20,7 +20,7 @@
     all: '| tee -a /var/log/cloud-init-output.log /dev/tty0'
 
 runcmd:
-   - if lvs vg0; then pvresize /dev/vda3; fi
+   - if lvs vg0; then pvresize $(pvdisplay -C -S vg_name=vg0 -o pv_name --noheadings | tail -n1); fi
    - if lvs vg0; then /usr/bin/growlvm.py --image-layout-file /usr/share/growlvm/image-layout.yml; fi
 
    - export TERM=linux
@@ -75,4 +75,7 @@
     devices:
       - '/'
       - '/dev/vda3'
+      - '/dev/vdb3'
+      - '/dev/vdc3'
+      - '/dev/vdd3'
     ignore_growroot_disabled: false
diff --git a/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/underlay-userdata.yaml b/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/underlay-userdata.yaml
index 567a445..bb6338c 100644
--- a/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/underlay-userdata.yaml
+++ b/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/underlay-userdata.yaml
@@ -20,7 +20,7 @@
     all: '| tee -a /var/log/cloud-init-output.log /dev/tty0'
 
 runcmd:
-   - if lvs vg0; then pvresize /dev/vda3; fi
+   - if lvs vg0; then pvresize $(pvdisplay -C -S vg_name=vg0 -o pv_name --noheadings | tail -n1); fi
    - if lvs vg0; then /usr/bin/growlvm.py --image-layout-file /usr/share/growlvm/image-layout.yml; fi
 
    - export TERM=linux
@@ -75,4 +75,7 @@
     devices:
       - '/'
       - '/dev/vda3'
+      - '/dev/vdb3'
+      - '/dev/vdc3'
+      - '/dev/vdd3'
     ignore_growroot_disabled: false