diff --git a/docker/common/openvswitch/ovs-db-server/config-external.sh b/docker/common/openvswitch/ovs-db-server/config-external.sh
deleted file mode 100644
index 9ada4efcb1..0000000000
--- a/docker/common/openvswitch/ovs-db-server/config-external.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-#This file should be a noop. It just needs to exist, but it don't perform any function
diff --git a/docker/common/openvswitch/ovs-db-server/start.sh b/docker/common/openvswitch/ovs-db-server/start.sh
deleted file mode 100755
index 89b2e3e92b..0000000000
--- a/docker/common/openvswitch/ovs-db-server/start.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-set -o errexit
-
-LOG_FILE="/var/log/openvswitch/ovsdb-server.log"
-DB_FILE="/etc/openvswitch/conf.db"
-UNIXSOCK_DIR="/var/run/openvswitch"
-UNIXSOCK="${UNIXSOCK_DIR}/db.sock"
-
-CMD="/usr/sbin/ovsdb-server"
-ARGS="$DB_FILE -vconsole:emer -vsyslog:err -vfile:info --remote=punix:${UNIXSOCK} --log-file=${LOG_FILE}"
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-# Execute config strategy
-set_configs
-
-mkdir -p "${UNIXSOCK_DIR}"
-
-if [[ ! -e "${DB_FILE}" ]]; then
-    ovsdb-tool create "${DB_FILE}"
-fi
-
-exec $CMD $ARGS
diff --git a/docker/common/openvswitch/ovs-vswitchd/config-external.sh b/docker/common/openvswitch/ovs-vswitchd/config-external.sh
deleted file mode 100644
index 9ada4efcb1..0000000000
--- a/docker/common/openvswitch/ovs-vswitchd/config-external.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-#This file should be a noop. It just needs to exist, but it don't perform any function
diff --git a/docker/common/openvswitch/ovs-vswitchd/ovs_ensure_configured.sh b/docker/common/openvswitch/ovs-vswitchd/ovs_ensure_configured.sh
deleted file mode 100755
index c39d64ff7a..0000000000
--- a/docker/common/openvswitch/ovs-vswitchd/ovs_ensure_configured.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-bridge=$1
-port=$2
-
-ovs-vsctl br-exists $bridge; rc=$?
-if [[ $rc == 2 ]]; then
-    changed=changed
-    ovs-vsctl add-br $bridge
-fi
-
-if [[ ! $(ovs-vsctl list-ports $bridge) =~ $(echo "\<$port\>") ]]; then
-    changed=changed
-    ovs-vsctl add-port $bridge $port
-fi
-
-echo $changed
diff --git a/docker/common/openvswitch/ovs-vswitchd/start.sh b/docker/common/openvswitch/ovs-vswitchd/start.sh
deleted file mode 100755
index 3ec2c26b22..0000000000
--- a/docker/common/openvswitch/ovs-vswitchd/start.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-LOG_FILE="/var/log/openvswitch/ovs-vswitchd.log"
-DB_FILE="/etc/openvswitch/conf.db"
-UNIXSOCK_DIR="/var/run/openvswitch"
-UNIXSOCK="${UNIXSOCK_DIR}/db.sock"
-
-CMD="/usr/sbin/ovs-vswitchd"
-ARGS="unix:${UNIXSOCK} -vconsole:emer -vsyslog:err -vfile:info --mlockall --log-file=${LOG_FILE}"
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-# Execute config strategy
-set_configs
-
-modprobe openvswitch
-mkdir -p "${UNIXSOCK_DIR}"
-
-exec $CMD $ARGS
diff --git a/docker_templates/openvswitch/ovs-db-server/config-external.sh b/docker_templates/openvswitch/ovs-db-server/config-external.sh
deleted file mode 120000
index ee1e0112cc..0000000000
--- a/docker_templates/openvswitch/ovs-db-server/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../docker/common/openvswitch/ovs-db-server/config-external.sh
\ No newline at end of file
diff --git a/docker_templates/openvswitch/ovs-db-server/config-external.sh b/docker_templates/openvswitch/ovs-db-server/config-external.sh
new file mode 100644
index 0000000000..9ada4efcb1
--- /dev/null
+++ b/docker_templates/openvswitch/ovs-db-server/config-external.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+#This file should be a noop. It just needs to exist, but it don't perform any function
diff --git a/docker_templates/openvswitch/ovs-db-server/start.sh b/docker_templates/openvswitch/ovs-db-server/start.sh
deleted file mode 120000
index f9408f4d44..0000000000
--- a/docker_templates/openvswitch/ovs-db-server/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../docker/common/openvswitch/ovs-db-server/start.sh
\ No newline at end of file
diff --git a/docker_templates/openvswitch/ovs-db-server/start.sh b/docker_templates/openvswitch/ovs-db-server/start.sh
new file mode 100755
index 0000000000..89b2e3e92b
--- /dev/null
+++ b/docker_templates/openvswitch/ovs-db-server/start.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+set -o errexit
+
+LOG_FILE="/var/log/openvswitch/ovsdb-server.log"
+DB_FILE="/etc/openvswitch/conf.db"
+UNIXSOCK_DIR="/var/run/openvswitch"
+UNIXSOCK="${UNIXSOCK_DIR}/db.sock"
+
+CMD="/usr/sbin/ovsdb-server"
+ARGS="$DB_FILE -vconsole:emer -vsyslog:err -vfile:info --remote=punix:${UNIXSOCK} --log-file=${LOG_FILE}"
+
+# Loading common functions.
+source /opt/kolla/kolla-common.sh
+
+# Execute config strategy
+set_configs
+
+mkdir -p "${UNIXSOCK_DIR}"
+
+if [[ ! -e "${DB_FILE}" ]]; then
+    ovsdb-tool create "${DB_FILE}"
+fi
+
+exec $CMD $ARGS
diff --git a/docker_templates/openvswitch/ovs-vswitchd/config-external.sh b/docker_templates/openvswitch/ovs-vswitchd/config-external.sh
deleted file mode 120000
index 46269880d7..0000000000
--- a/docker_templates/openvswitch/ovs-vswitchd/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../docker/common/openvswitch/ovs-vswitchd/config-external.sh
\ No newline at end of file
diff --git a/docker_templates/openvswitch/ovs-vswitchd/config-external.sh b/docker_templates/openvswitch/ovs-vswitchd/config-external.sh
new file mode 100644
index 0000000000..9ada4efcb1
--- /dev/null
+++ b/docker_templates/openvswitch/ovs-vswitchd/config-external.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+#This file should be a noop. It just needs to exist, but it don't perform any function
diff --git a/docker_templates/openvswitch/ovs-vswitchd/ovs_ensure_configured.sh b/docker_templates/openvswitch/ovs-vswitchd/ovs_ensure_configured.sh
deleted file mode 120000
index de6ac48708..0000000000
--- a/docker_templates/openvswitch/ovs-vswitchd/ovs_ensure_configured.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../docker/common/openvswitch/ovs-vswitchd/ovs_ensure_configured.sh
\ No newline at end of file
diff --git a/docker_templates/openvswitch/ovs-vswitchd/ovs_ensure_configured.sh b/docker_templates/openvswitch/ovs-vswitchd/ovs_ensure_configured.sh
new file mode 100755
index 0000000000..c39d64ff7a
--- /dev/null
+++ b/docker_templates/openvswitch/ovs-vswitchd/ovs_ensure_configured.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+bridge=$1
+port=$2
+
+ovs-vsctl br-exists $bridge; rc=$?
+if [[ $rc == 2 ]]; then
+    changed=changed
+    ovs-vsctl add-br $bridge
+fi
+
+if [[ ! $(ovs-vsctl list-ports $bridge) =~ $(echo "\<$port\>") ]]; then
+    changed=changed
+    ovs-vsctl add-port $bridge $port
+fi
+
+echo $changed
diff --git a/docker_templates/openvswitch/ovs-vswitchd/start.sh b/docker_templates/openvswitch/ovs-vswitchd/start.sh
deleted file mode 120000
index 6fe55d6da7..0000000000
--- a/docker_templates/openvswitch/ovs-vswitchd/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../docker/common/openvswitch/ovs-vswitchd/start.sh
\ No newline at end of file
diff --git a/docker_templates/openvswitch/ovs-vswitchd/start.sh b/docker_templates/openvswitch/ovs-vswitchd/start.sh
new file mode 100755
index 0000000000..3ec2c26b22
--- /dev/null
+++ b/docker_templates/openvswitch/ovs-vswitchd/start.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+LOG_FILE="/var/log/openvswitch/ovs-vswitchd.log"
+DB_FILE="/etc/openvswitch/conf.db"
+UNIXSOCK_DIR="/var/run/openvswitch"
+UNIXSOCK="${UNIXSOCK_DIR}/db.sock"
+
+CMD="/usr/sbin/ovs-vswitchd"
+ARGS="unix:${UNIXSOCK} -vconsole:emer -vsyslog:err -vfile:info --mlockall --log-file=${LOG_FILE}"
+
+# Loading common functions.
+source /opt/kolla/kolla-common.sh
+
+# Execute config strategy
+set_configs
+
+modprobe openvswitch
+mkdir -p "${UNIXSOCK_DIR}"
+
+exec $CMD $ARGS