diff --git a/tools/deployment/baremetal/005-setup-nodes.sh b/tools/deployment/baremetal/005-setup-nodes.sh
index a2b8406146..464bdefd6a 100755
--- a/tools/deployment/baremetal/005-setup-nodes.sh
+++ b/tools/deployment/baremetal/005-setup-nodes.sh
@@ -28,6 +28,7 @@ make all
 
 #NOTE: Deploy libvirt with vbmc then define domains to use as baremetal nodes
 : ${OSH_INFRA_PATH:="../openstack-helm-infra"}
+make -C ${OSH_INFRA_PATH} libvirt
 helm install ${OSH_INFRA_PATH}/libvirt \
   --namespace=libvirt \
   --name=libvirt \
diff --git a/tools/deployment/developer/ceph/150-libvirt.sh b/tools/deployment/developer/ceph/150-libvirt.sh
index 71514dd884..952dadd8e8 100755
--- a/tools/deployment/developer/ceph/150-libvirt.sh
+++ b/tools/deployment/developer/ceph/150-libvirt.sh
@@ -16,10 +16,10 @@
 set -xe
 
 #NOTE: Lint and package chart
-make libvirt
+: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
+make -C ${OSH_INFRA_PATH} libvirt
 
 #NOTE: Deploy command
-: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
 : ${OSH_EXTRA_HELM_ARGS:=""}
 helm upgrade --install libvirt ${OSH_INFRA_PATH}/libvirt \
   --namespace=openstack \
diff --git a/tools/deployment/developer/nfs/150-libvirt.sh b/tools/deployment/developer/nfs/150-libvirt.sh
index c3420ae4e3..d746b7f496 100755
--- a/tools/deployment/developer/nfs/150-libvirt.sh
+++ b/tools/deployment/developer/nfs/150-libvirt.sh
@@ -16,10 +16,10 @@
 set -xe
 
 #NOTE: Lint and package chart
-make libvirt
+: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
+make -C ${OSH_INFRA_PATH} libvirt
 
 #NOTE: Deploy command
-: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
 : ${OSH_EXTRA_HELM_ARGS:=""}
 helm upgrade --install libvirt ${OSH_INFRA_PATH}/libvirt \
   --namespace=openstack \