diff --git a/docker/common/magnum/magnum-api/config-external.sh b/docker/common/magnum/magnum-api/config-external.sh
deleted file mode 100644
index 573043f7d9cba5e5aa05cc483129fb9a73676eec..0000000000000000000000000000000000000000
--- a/docker/common/magnum/magnum-api/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/magnum/magnum-api/magnum.conf"
-TARGET="/etc/magnum/magnum.conf"
-OWNER="magnum"
-
-if [[ -f "$SOURCE" ]]; then
-    cp $SOURCE $TARGET
-    chown ${OWNER}: $TARGET
-    chmod 0644 $TARGET
-fi
diff --git a/docker/common/magnum/magnum-api/start.sh b/docker/common/magnum/magnum-api/start.sh
deleted file mode 100755
index ed154e29a2a67925743b1aaf5794ad37ae716152..0000000000000000000000000000000000000000
--- a/docker/common/magnum/magnum-api/start.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-set -o errexit
-CMD="/usr/bin/magnum-api"
-ARGS=""
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-# Execute config strategy
-set_configs
-
-# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
-# of the KOLLA_BOOTSTRAP variable being set, including empty.
-if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
-    su -s /bin/sh -c "magnum-manage db_sync" magnum
-    exit 0
-fi
-
-exec $CMD $ARGS
diff --git a/docker/common/magnum/magnum-conductor/config-external.sh b/docker/common/magnum/magnum-conductor/config-external.sh
deleted file mode 100644
index b96e3179e0a99721f0e06e7351e2ce6cf79d2435..0000000000000000000000000000000000000000
--- a/docker/common/magnum/magnum-conductor/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/magnum/magnum-conductor/magnum.conf"
-TARGET="/etc/magnum/magnum.conf"
-OWNER="magnum"
-
-if [[ -f "$SOURCE" ]]; then
-    cp $SOURCE $TARGET
-    chown ${OWNER}: $TARGET
-    chmod 0644 $TARGET
-fi
diff --git a/docker/common/magnum/magnum-conductor/start.sh b/docker/common/magnum/magnum-conductor/start.sh
deleted file mode 100755
index a5c76ee8505999011c40d8560428535ff19aafa5..0000000000000000000000000000000000000000
--- a/docker/common/magnum/magnum-conductor/start.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-set -o errexit
-
-CMD="/usr/bin/magnum-conductor"
-ARGS=""
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-# Execute config strategy
-set_configs
-
-exec $CMD $ARGS
diff --git a/docker_templates/magnum/magnum-api/config-external.sh b/docker_templates/magnum/magnum-api/config-external.sh
deleted file mode 120000
index 0adec980b29fe0b0f193efe7f64a016da7c72dce..0000000000000000000000000000000000000000
--- a/docker_templates/magnum/magnum-api/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../docker/common/magnum/magnum-api/config-external.sh
\ No newline at end of file
diff --git a/docker_templates/magnum/magnum-api/config-external.sh b/docker_templates/magnum/magnum-api/config-external.sh
new file mode 100644
index 0000000000000000000000000000000000000000..573043f7d9cba5e5aa05cc483129fb9a73676eec
--- /dev/null
+++ b/docker_templates/magnum/magnum-api/config-external.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+SOURCE="/opt/kolla/magnum/magnum-api/magnum.conf"
+TARGET="/etc/magnum/magnum.conf"
+OWNER="magnum"
+
+if [[ -f "$SOURCE" ]]; then
+    cp $SOURCE $TARGET
+    chown ${OWNER}: $TARGET
+    chmod 0644 $TARGET
+fi
diff --git a/docker_templates/magnum/magnum-api/start.sh b/docker_templates/magnum/magnum-api/start.sh
deleted file mode 120000
index d6de9b70ee3821484571ced9ac7d0aa930927240..0000000000000000000000000000000000000000
--- a/docker_templates/magnum/magnum-api/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../docker/common/magnum/magnum-api/start.sh
\ No newline at end of file
diff --git a/docker_templates/magnum/magnum-api/start.sh b/docker_templates/magnum/magnum-api/start.sh
new file mode 100755
index 0000000000000000000000000000000000000000..ed154e29a2a67925743b1aaf5794ad37ae716152
--- /dev/null
+++ b/docker_templates/magnum/magnum-api/start.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+set -o errexit
+CMD="/usr/bin/magnum-api"
+ARGS=""
+
+# Loading common functions.
+source /opt/kolla/kolla-common.sh
+
+# Execute config strategy
+set_configs
+
+# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
+# of the KOLLA_BOOTSTRAP variable being set, including empty.
+if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
+    su -s /bin/sh -c "magnum-manage db_sync" magnum
+    exit 0
+fi
+
+exec $CMD $ARGS
diff --git a/docker_templates/magnum/magnum-conductor/config-external.sh b/docker_templates/magnum/magnum-conductor/config-external.sh
deleted file mode 120000
index 694c7b5d73550879a67a02a7fe0fef0e875ae31a..0000000000000000000000000000000000000000
--- a/docker_templates/magnum/magnum-conductor/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../docker/common/magnum/magnum-conductor/config-external.sh
\ No newline at end of file
diff --git a/docker_templates/magnum/magnum-conductor/config-external.sh b/docker_templates/magnum/magnum-conductor/config-external.sh
new file mode 100644
index 0000000000000000000000000000000000000000..b96e3179e0a99721f0e06e7351e2ce6cf79d2435
--- /dev/null
+++ b/docker_templates/magnum/magnum-conductor/config-external.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+SOURCE="/opt/kolla/magnum/magnum-conductor/magnum.conf"
+TARGET="/etc/magnum/magnum.conf"
+OWNER="magnum"
+
+if [[ -f "$SOURCE" ]]; then
+    cp $SOURCE $TARGET
+    chown ${OWNER}: $TARGET
+    chmod 0644 $TARGET
+fi
diff --git a/docker_templates/magnum/magnum-conductor/start.sh b/docker_templates/magnum/magnum-conductor/start.sh
deleted file mode 120000
index 42ca31c466bbbccd400327dbb735339180076dc1..0000000000000000000000000000000000000000
--- a/docker_templates/magnum/magnum-conductor/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../docker/common/magnum/magnum-conductor/start.sh
\ No newline at end of file
diff --git a/docker_templates/magnum/magnum-conductor/start.sh b/docker_templates/magnum/magnum-conductor/start.sh
new file mode 100755
index 0000000000000000000000000000000000000000..a5c76ee8505999011c40d8560428535ff19aafa5
--- /dev/null
+++ b/docker_templates/magnum/magnum-conductor/start.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -o errexit
+
+CMD="/usr/bin/magnum-conductor"
+ARGS=""
+
+# Loading common functions.
+source /opt/kolla/kolla-common.sh
+
+# Execute config strategy
+set_configs
+
+exec $CMD $ARGS