diff --git a/devstack/lib/ironic b/devstack/lib/ironic
index 6c3ed09aac..899559d828 100644
--- a/devstack/lib/ironic
+++ b/devstack/lib/ironic
@@ -2438,6 +2438,8 @@ function cleanup_baremetal_basic_ops {
         done
     done
 
+    sudo killall vbmc || true
+
     sudo ovs-vsctl --if-exists del-br $IRONIC_VM_NETWORK_BRIDGE
 
     sudo rm -rf /etc/xinetd.d/tftp /etc/init/tftpd-hpa.override
diff --git a/devstack/tools/ironic/scripts/cleanup-node.sh b/devstack/tools/ironic/scripts/cleanup-node.sh
index 466b7059b8..e594c282be 100755
--- a/devstack/tools/ironic/scripts/cleanup-node.sh
+++ b/devstack/tools/ironic/scripts/cleanup-node.sh
@@ -23,7 +23,7 @@ virsh list --inactive | grep -q $NAME && virsh undefine $NAME --nvram
 
 # Delete the Virtual BMC
 if [[ $(type -P vbmc) != "" ]]; then
-    vbmc list | grep -a $NAME && vbmc delete $NAME
+    sudo vbmc list | grep -a $NAME && sudo vbmc delete $NAME
 fi
 
 if virsh pool-list | grep -q $LIBVIRT_STORAGE_POOL ; then
diff --git a/devstack/tools/ironic/scripts/create-node.sh b/devstack/tools/ironic/scripts/create-node.sh
index 908aadca53..a264522824 100755
--- a/devstack/tools/ironic/scripts/create-node.sh
+++ b/devstack/tools/ironic/scripts/create-node.sh
@@ -131,8 +131,8 @@ if ! virsh list --all | grep -q $NAME; then
 
     # Createa Virtual BMC for the node if IPMI is used
     if [[ $(type -P vbmc) != "" ]]; then
-        vbmc add $NAME --port $VBMC_PORT
-        vbmc start $NAME
+        sudo vbmc add $NAME --port $VBMC_PORT
+        sudo vbmc start $NAME
     fi
 fi