diff --git a/tools/deployment/openstack-support/050-libvirt.sh b/tools/deployment/openstack-support/050-libvirt.sh
index bac1ce16c..48c053a7e 100755
--- a/tools/deployment/openstack-support/050-libvirt.sh
+++ b/tools/deployment/openstack-support/050-libvirt.sh
@@ -23,5 +23,13 @@ helm upgrade --install libvirt ./libvirt \
   --namespace=openstack \
   --set network.backend="null"
 
+#NOTE: Please be aware that a network backend might affect
+#The loadability of this, as some need to be asynchronously
+#loaded. See also:
+#https://github.com/openstack/openstack-helm-infra/blob/b69584bd658ae5cb6744e499975f9c5a505774e5/libvirt/values.yaml#L151-L172
+if [[ "${WAIT_FOR_PODS:=True}" == "True" ]]; then
+    ./tools/deployment/common/wait-for-pods.sh openstack
+fi
+
 #NOTE: Validate Deployment info
 helm status libvirt
diff --git a/tools/deployment/openstack-support/060-openvswitch.sh b/tools/deployment/openstack-support/060-openvswitch.sh
index 4809db93f..b903afede 100755
--- a/tools/deployment/openstack-support/060-openvswitch.sh
+++ b/tools/deployment/openstack-support/060-openvswitch.sh
@@ -22,7 +22,7 @@ helm upgrade --install openvswitch ./openvswitch \
   ${OSH_EXTRA_HELM_ARGS_OPENVSWITCH}
 
 #NOTE: Wait for deploy
-./tools/deployment/common/wait-for-pods.sh osh-infra
+./tools/deployment/common/wait-for-pods.sh openstack
 
 #NOTE: Validate Deployment info
 helm status openvswitch