diff --git a/ansible/roles/neutron/tasks/start.yml b/ansible/roles/neutron/tasks/start.yml
index b2181196e8..5d8d3eaf32 100644
--- a/ansible/roles/neutron/tasks/start.yml
+++ b/ansible/roles/neutron/tasks/start.yml
@@ -39,6 +39,13 @@
   when: (inventory_hostname in groups['compute'] or inventory_hostname in groups['neutron-agents'])
         and neutron_plugin_agent == "openvswitch"
 
+- name: Ensuring OVS bridge is properly setup
+  command: docker exec openvswitch_db /usr/local/bin/kolla_ensure_openvswitch_configured {{ neutron_bridge_name }} {{ neutron_external_interface }}
+  register: status
+  changed_when: status.stdout.find('changed') != -1
+  when: (inventory_hostname in groups['compute'] or inventory_hostname in groups['neutron-agents'])
+        and neutron_plugin_agent == "openvswitch"
+
 - name: Starting Openvswitch-vswitchd container
   docker:
     tty: True
@@ -63,13 +70,6 @@
   when: (inventory_hostname in groups['compute'] or inventory_hostname in groups['neutron-agents'])
         and neutron_plugin_agent == "openvswitch"
 
-- name: Ensuring OVS bridge is properly setup
-  command: docker exec openvswitch_vswitchd /usr/local/bin/kolla_ensure_openvswitch_configured {{ neutron_bridge_name }} {{ neutron_external_interface }}
-  register: status
-  changed_when: status.stdout.find('changed') != -1
-  when: (inventory_hostname in groups['compute'] or inventory_hostname in groups['neutron-agents'])
-        and neutron_plugin_agent == "openvswitch"
-
 - name: Starting Neutron-server container
   docker:
     tty: True
diff --git a/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 b/docker/openvswitch/openvswitch-db-server/Dockerfile.j2
index 8692f8cee7..1bcc6e71e8 100644
--- a/docker/openvswitch/openvswitch-db-server/Dockerfile.j2
+++ b/docker/openvswitch/openvswitch-db-server/Dockerfile.j2
@@ -1,7 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}openvswitch-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+COPY ovs_ensure_configured.sh /usr/local/bin/kolla_ensure_openvswitch_configured
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
-RUN chmod 755 /usr/local/bin/kolla_extend_start
+RUN chmod 755 /usr/local/bin/kolla_ensure_openvswitch_configured /usr/local/bin/kolla_extend_start
 
 {{ include_footer }}
diff --git a/docker/openvswitch/openvswitch-vswitchd/ovs_ensure_configured.sh b/docker/openvswitch/openvswitch-db-server/ovs_ensure_configured.sh
similarity index 72%
rename from docker/openvswitch/openvswitch-vswitchd/ovs_ensure_configured.sh
rename to docker/openvswitch/openvswitch-db-server/ovs_ensure_configured.sh
index c39d64ff7a..99bae3e874 100644
--- a/docker/openvswitch/openvswitch-vswitchd/ovs_ensure_configured.sh
+++ b/docker/openvswitch/openvswitch-db-server/ovs_ensure_configured.sh
@@ -6,12 +6,12 @@ port=$2
 ovs-vsctl br-exists $bridge; rc=$?
 if [[ $rc == 2 ]]; then
     changed=changed
-    ovs-vsctl add-br $bridge
+    ovs-vsctl --no-wait add-br $bridge
 fi
 
 if [[ ! $(ovs-vsctl list-ports $bridge) =~ $(echo "\<$port\>") ]]; then
     changed=changed
-    ovs-vsctl add-port $bridge $port
+    ovs-vsctl --no-wait add-port $bridge $port
 fi
 
 echo $changed
diff --git a/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 b/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2
index 43f3ca55eb..8692f8cee7 100644
--- a/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2
+++ b/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2
@@ -1,8 +1,7 @@
 FROM {{ namespace }}/{{ image_prefix }}openvswitch-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
-COPY ovs_ensure_configured.sh /usr/local/bin/kolla_ensure_openvswitch_configured
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
-RUN chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_ensure_openvswitch_configured
+RUN chmod 755 /usr/local/bin/kolla_extend_start
 
 {{ include_footer }}