diff --git a/tools/cleanup-containers b/tools/cleanup-containers
index 7396213363dafedc56aeb42c5b0196209d6d1935..14249c9605ee798b9a0bfbd30e5bd438222dec24 100755
--- a/tools/cleanup-containers
+++ b/tools/cleanup-containers
@@ -16,11 +16,6 @@ else
         egrep -v '(^\s*$)' | sort | uniq)
 fi
 
-echo "Removing ovs bridge..."
-(docker exec -u root neutron_openvswitch_agent neutron-ovs-cleanup \
-    --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini \
-    --ovs_all_ports) > /dev/null
-
 echo "Stopping containers..."
 (docker stop -t 2 ${containers_to_kill} 2>&1) > /dev/null
 
diff --git a/tools/cleanup-host b/tools/cleanup-host
index c50a3a287a42b80282f6a032a8a04abc8be7ef45..59d463b2262c795840bc140d2cdfbb24eeeb1525 100755
--- a/tools/cleanup-host
+++ b/tools/cleanup-host
@@ -27,6 +27,11 @@ ip -o link show | awk -F': ' '/vxlan/{print $2}' | while read -r ifname ; do
     ip link delete $ifname type vxlan
 done
 
+echo "Removing ovs bridge..."
+(docker exec -u root neutron_openvswitch_agent neutron-ovs-cleanup \
+    --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini \
+    --ovs_all_ports) > /dev/null
+
 # Keepalived leaves VIP on the host in case of accidental removal.
 # This snippet removes VIPs.
 if [[ "$enable_haproxy" == "yes" ]]; then
@@ -57,3 +62,4 @@ for dir in $FOLDER_PATH*; do
         rm -rfv $dir
     fi
 done
+