diff --git a/templates/common/_base/files/nmstate-configuration.yaml b/templates/common/_base/files/nmstate-configuration.yaml
index 42518fe6bb..891c6fdffe 100644
--- a/templates/common/_base/files/nmstate-configuration.yaml
+++ b/templates/common/_base/files/nmstate-configuration.yaml
@@ -36,5 +36,11 @@ contents:
       exit 1
     fi
 
+    # Handle the case where we're migrating from configure-ovs
+    ovs-vsctl --timeout=30 --if-exists del-br br-ex
+
+    # Handle the case where we're migrating from OpenShift SDN
+    ovs-vsctl --timeout=30 --if-exists del-br br0
+
     cp "$src_path/$config_file" /etc/nmstate
     touch /etc/nmstate/openshift/applied