diff --git a/tools/cleanup-containers b/tools/cleanup-containers
index 14249c9605ee798b9a0bfbd30e5bd438222dec24..7396213363dafedc56aeb42c5b0196209d6d1935 100755
--- a/tools/cleanup-containers
+++ b/tools/cleanup-containers
@@ -16,6 +16,11 @@ 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