diff --git a/docker/common/glance/glance-api/config-external.sh b/docker/common/glance/glance-api/config-external.sh
deleted file mode 100755
index ce54117381c7ff503ca7ac485dd485fd90f01aa4..0000000000000000000000000000000000000000
--- a/docker/common/glance/glance-api/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/glance-api/glance-api.conf"
-TARGET="/etc/glance/glance-api.conf"
-OWNER="glance"
-
-if [[ -f "$SOURCE" ]]; then
-    cp $SOURCE $TARGET
-    chown ${OWNER}: $TARGET
-    chmod 0644 $TARGET
-fi
diff --git a/docker/common/glance/glance-api/start.sh b/docker/common/glance/glance-api/start.sh
deleted file mode 100755
index ce3cb6d8bb0b3a64195a7cbdb0ff1a7c81fdc296..0000000000000000000000000000000000000000
--- a/docker/common/glance/glance-api/start.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-CMD="/usr/bin/glance-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 "glance-manage db_sync" glance
-    exit 0
-fi
-
-exec $CMD $ARGS
diff --git a/docker/common/glance/glance-registry/config-external.sh b/docker/common/glance/glance-registry/config-external.sh
deleted file mode 100755
index 37abd136dad17aaaf2b08ee16cd58adf0dc73873..0000000000000000000000000000000000000000
--- a/docker/common/glance/glance-registry/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/glance-registry/glance-registry.conf"
-TARGET="/etc/glance/glance-registry.conf"
-OWNER="glance"
-
-if [[ -f "$SOURCE" ]]; then
-    cp $SOURCE $TARGET
-    chown ${OWNER}: $TARGET
-    chmod 0644 $TARGET
-fi
diff --git a/docker/common/glance/glance-registry/start.sh b/docker/common/glance/glance-registry/start.sh
deleted file mode 100755
index 1d8265f80a23fded1d984e4726eefd9a5b88b7ee..0000000000000000000000000000000000000000
--- a/docker/common/glance/glance-registry/start.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-CMD="/usr/bin/glance-registry"
-ARGS=""
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-# Execute config strategy
-set_configs
-
-exec $CMD $ARGS
diff --git a/docker_templates/glance/glance-api/config-external.sh b/docker_templates/glance/glance-api/config-external.sh
deleted file mode 120000
index 4261b90e19e2e60ee52f2146003814e2cf62dbff..0000000000000000000000000000000000000000
--- a/docker_templates/glance/glance-api/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../docker/common/glance/glance-api/config-external.sh
\ No newline at end of file
diff --git a/docker_templates/glance/glance-api/config-external.sh b/docker_templates/glance/glance-api/config-external.sh
new file mode 100755
index 0000000000000000000000000000000000000000..ce54117381c7ff503ca7ac485dd485fd90f01aa4
--- /dev/null
+++ b/docker_templates/glance/glance-api/config-external.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+SOURCE="/opt/kolla/glance-api/glance-api.conf"
+TARGET="/etc/glance/glance-api.conf"
+OWNER="glance"
+
+if [[ -f "$SOURCE" ]]; then
+    cp $SOURCE $TARGET
+    chown ${OWNER}: $TARGET
+    chmod 0644 $TARGET
+fi
diff --git a/docker_templates/glance/glance-api/start.sh b/docker_templates/glance/glance-api/start.sh
deleted file mode 120000
index 395aafe82e29a9b85271d406b0d55ed2109ef09a..0000000000000000000000000000000000000000
--- a/docker_templates/glance/glance-api/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../docker/common/glance/glance-api/start.sh
\ No newline at end of file
diff --git a/docker_templates/glance/glance-api/start.sh b/docker_templates/glance/glance-api/start.sh
new file mode 100755
index 0000000000000000000000000000000000000000..ce3cb6d8bb0b3a64195a7cbdb0ff1a7c81fdc296
--- /dev/null
+++ b/docker_templates/glance/glance-api/start.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+set -o errexit
+
+CMD="/usr/bin/glance-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 "glance-manage db_sync" glance
+    exit 0
+fi
+
+exec $CMD $ARGS
diff --git a/docker_templates/glance/glance-registry/config-external.sh b/docker_templates/glance/glance-registry/config-external.sh
deleted file mode 120000
index c652dc476c13bbb8cba6bf1b310037fab3b3b979..0000000000000000000000000000000000000000
--- a/docker_templates/glance/glance-registry/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../docker/common/glance/glance-registry/config-external.sh
\ No newline at end of file
diff --git a/docker_templates/glance/glance-registry/config-external.sh b/docker_templates/glance/glance-registry/config-external.sh
new file mode 100755
index 0000000000000000000000000000000000000000..37abd136dad17aaaf2b08ee16cd58adf0dc73873
--- /dev/null
+++ b/docker_templates/glance/glance-registry/config-external.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+SOURCE="/opt/kolla/glance-registry/glance-registry.conf"
+TARGET="/etc/glance/glance-registry.conf"
+OWNER="glance"
+
+if [[ -f "$SOURCE" ]]; then
+    cp $SOURCE $TARGET
+    chown ${OWNER}: $TARGET
+    chmod 0644 $TARGET
+fi
diff --git a/docker_templates/glance/glance-registry/start.sh b/docker_templates/glance/glance-registry/start.sh
deleted file mode 120000
index 72d1278abc3f8980dcc114665774d235a6484b85..0000000000000000000000000000000000000000
--- a/docker_templates/glance/glance-registry/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../docker/common/glance/glance-registry/start.sh
\ No newline at end of file
diff --git a/docker_templates/glance/glance-registry/start.sh b/docker_templates/glance/glance-registry/start.sh
new file mode 100755
index 0000000000000000000000000000000000000000..1d8265f80a23fded1d984e4726eefd9a5b88b7ee
--- /dev/null
+++ b/docker_templates/glance/glance-registry/start.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+set -o errexit
+
+CMD="/usr/bin/glance-registry"
+ARGS=""
+
+# Loading common functions.
+source /opt/kolla/kolla-common.sh
+
+# Execute config strategy
+set_configs
+
+exec $CMD $ARGS