diff --git a/ci/common/vbmc_setup.yaml b/ci/common/vbmc_setup.yaml
index e1989aec0d..5f8b8d3ca7 100644
--- a/ci/common/vbmc_setup.yaml
+++ b/ci/common/vbmc_setup.yaml
@@ -17,12 +17,8 @@ resources:
       group: script
       config: |
         #!/bin/bash
-        cd /etc/yum.repos.d
-        echo 'nameserver 1.1.1.1' > /etc/resolv.conf
-        curl https://opendev.org/openstack/tripleo-repos/raw/branch/master/tripleo_repos/main.py | python - current-tripleo
-        yum install -y python2-virtualbmc epel-release libvirt-client libvirt-daemon libvirt qemu-kvm-ev
-        yum install -y qemu-system-x86  # <-- needs epel
-        yum remove -y epel-release
+        set -e
+        $(command -v dnf || command -v yum) install -y python*-virtualbmc libvirt-client libvirt-daemon libvirt qemu-kvm
         systemctl start libvirtd virtualbmc
         git clone https://opendev.org/openstack/ironic /tmp/ironic
         mkdir -p /var/log/bmlogs
@@ -34,19 +30,24 @@ resources:
         chmod 644 /etc/puppet/ci-key
         cat /etc/puppet/ci-key.pub >> /root/.ssh/authorized_keys
 
-        # neutron_api workaround for https://github.com/ansible/ansible/issues/42108
-        # remove when ansible v2.5.8+ is in the container image
-        cat << EOF | docker exec -i -u 0 neutron_api /bin/bash -x
-        yum install -y epel-release
-        yum update -y ansible
+        LIBVIRT_STORAGE_POOL=${LIBVIRT_STORAGE_POOL:-"default"}
+        LIBVIRT_STORAGE_POOL_PATH=${LIBVIRT_STORAGE_POOL_PATH:-/var/lib/libvirt/images}
 
-        EOF
+        mkdir -p $LIBVIRT_STORAGE_POOL_PATH
 
-        docker restart neutron_api
+        if ! virsh pool-list --all | grep -q $LIBVIRT_STORAGE_POOL; then
+            virsh pool-define-as --name $LIBVIRT_STORAGE_POOL dir --target $LIBVIRT_STORAGE_POOL_PATH
+            virsh pool-autostart $LIBVIRT_STORAGE_POOL
+            virsh pool-start $LIBVIRT_STORAGE_POOL
+        fi
 
-        # nohup needed as vbmc seems to keep stdin open
-        nohup /tmp/ironic/devstack/tools/ironic/scripts/create-node.sh -n node1 -c 1 -m 3072 -d 10 -b br-ex -p 1161 -M 1350 -f qcow2 -a x86_64 -E qemu -e /usr/bin/qemu-system-x86_64 -l /var/log/bmlogs -A 66:0d:1d:d8:0b:11 > ~zuul/create-node-1.log 2>&1 < /dev/null
-        nohup /tmp/ironic/devstack/tools/ironic/scripts/create-node.sh -n node2 -c 1 -m 3072 -d 10 -b br-ex -p 1162 -M 1350 -f qcow2 -a x86_64 -E qemu -e /usr/bin/qemu-system-x86_64 -l /var/log/bmlogs -A 66:0d:1d:d8:0b:22 > ~zuul/create-node-2.log 2>&1 < /dev/null &
+        pool_state=$(virsh pool-info $LIBVIRT_STORAGE_POOL | grep State | awk '{ print $2 }')
+        if [ "$pool_state" != "running" ] ; then
+            virsh pool-start $LIBVIRT_STORAGE_POOL
+        fi
+
+        /tmp/ironic/devstack/tools/ironic/scripts/create-node.sh -n node1 -c 1 -m 3072 -d 10 -b br-ex -p 1161 -M 1350 -f qcow2 -a x86_64 -E qemu -l /var/log/bmlogs -A 66:0d:1d:d8:0b:11 > /var/log/bmlogs/create-node-1.log 2>&1 < /dev/null
+        /tmp/ironic/devstack/tools/ironic/scripts/create-node.sh -n node2 -c 1 -m 3072 -d 10 -b br-ex -p 1162 -M 1350 -f qcow2 -a x86_64 -E qemu -l /var/log/bmlogs -A 66:0d:1d:d8:0b:22 > /var/log/bmlogs/create-node-2.log 2>&1 < /dev/null
 
         vbmc --no-daemon add node1 --port 1161
         vbmc --no-daemon start node1