diff --git a/tools/deployment/baremetal/005-setup-nodes.sh b/tools/deployment/baremetal/005-setup-nodes.sh
index a1650b38f7..05e43e58aa 100755
--- a/tools/deployment/baremetal/005-setup-nodes.sh
+++ b/tools/deployment/baremetal/005-setup-nodes.sh
@@ -69,6 +69,8 @@ done
 
 #NOTE: Deploy OvS to connect nodes to the deployment host
 : ${OSH_INFRA_PATH:="../openstack-helm-infra"}
+make -C ${OSH_INFRA_PATH} openvswitch
+
 helm install ${OSH_INFRA_PATH}/openvswitch \
   --namespace=openstack \
   --name=openvswitch
diff --git a/tools/deployment/developer/common/140-openvswitch.sh b/tools/deployment/developer/common/140-openvswitch.sh
index 1d9a0b3011..c54f2c1d01 100755
--- a/tools/deployment/developer/common/140-openvswitch.sh
+++ b/tools/deployment/developer/common/140-openvswitch.sh
@@ -16,10 +16,10 @@
 set -xe
 
 #NOTE: Lint and package chart
-make openvswitch
+: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
+make -C ${OSH_INFRA_PATH} openvswitch
 
 #NOTE: Deploy command
-: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
 : ${OSH_EXTRA_HELM_ARGS:=""}
 helm upgrade --install openvswitch ${OSH_INFRA_PATH}/openvswitch \
   --namespace=openstack \