diff --git a/docker/common/gnocchi/gnocchi-api/config-external.sh b/docker/common/gnocchi/gnocchi-api/config-external.sh
deleted file mode 100644
index 59639ba637..0000000000
--- a/docker/common/gnocchi/gnocchi-api/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/gnocchi-api/gnocchi-api.conf"
-TARGET="/etc/gnocchi/gnocchi-api.conf"
-OWNER="gnocchi"
-
-if [[ -f "$SOURCE" ]]; then
-    cp $SOURCE $TARGET
-    chown ${OWNER}: $TARGET
-    chmod 0644 $TARGET
-fi
diff --git a/docker/common/gnocchi/gnocchi-api/start.sh b/docker/common/gnocchi/gnocchi-api/start.sh
deleted file mode 100755
index 657368a27b..0000000000
--- a/docker/common/gnocchi/gnocchi-api/start.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-CMD="/usr/bin/gnocchi-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 "gnocchi-manage db_sync" gnocchi
-    exit 0
-fi
-
-exec $CMD $ARGS
-
diff --git a/docker/common/gnocchi/gnocchi-statsd/config-external.sh b/docker/common/gnocchi/gnocchi-statsd/config-external.sh
deleted file mode 100644
index 59639ba637..0000000000
--- a/docker/common/gnocchi/gnocchi-statsd/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/gnocchi-api/gnocchi-api.conf"
-TARGET="/etc/gnocchi/gnocchi-api.conf"
-OWNER="gnocchi"
-
-if [[ -f "$SOURCE" ]]; then
-    cp $SOURCE $TARGET
-    chown ${OWNER}: $TARGET
-    chmod 0644 $TARGET
-fi
diff --git a/docker/common/gnocchi/gnocchi-statsd/start.sh b/docker/common/gnocchi/gnocchi-statsd/start.sh
deleted file mode 100755
index 636e713238..0000000000
--- a/docker/common/gnocchi/gnocchi-statsd/start.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-CMD="/usr/bin/gnocchi-statsd"
-ARGS=""
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-# Execute config strategy
-set_configs
-
-exec $CMD $ARGS
-
diff --git a/docker_templates/gnocchi/gnocchi-api/config-external.sh b/docker_templates/gnocchi/gnocchi-api/config-external.sh
deleted file mode 120000
index ef5155846f..0000000000
--- a/docker_templates/gnocchi/gnocchi-api/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../docker/common/gnocchi/gnocchi-api/config-external.sh
\ No newline at end of file
diff --git a/docker_templates/gnocchi/gnocchi-api/config-external.sh b/docker_templates/gnocchi/gnocchi-api/config-external.sh
new file mode 100644
index 0000000000..59639ba637
--- /dev/null
+++ b/docker_templates/gnocchi/gnocchi-api/config-external.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+SOURCE="/opt/kolla/gnocchi-api/gnocchi-api.conf"
+TARGET="/etc/gnocchi/gnocchi-api.conf"
+OWNER="gnocchi"
+
+if [[ -f "$SOURCE" ]]; then
+    cp $SOURCE $TARGET
+    chown ${OWNER}: $TARGET
+    chmod 0644 $TARGET
+fi
diff --git a/docker_templates/gnocchi/gnocchi-api/start.sh b/docker_templates/gnocchi/gnocchi-api/start.sh
deleted file mode 120000
index 92849bb3d4..0000000000
--- a/docker_templates/gnocchi/gnocchi-api/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../docker/common/gnocchi/gnocchi-api/start.sh
\ No newline at end of file
diff --git a/docker_templates/gnocchi/gnocchi-api/start.sh b/docker_templates/gnocchi/gnocchi-api/start.sh
new file mode 100755
index 0000000000..657368a27b
--- /dev/null
+++ b/docker_templates/gnocchi/gnocchi-api/start.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+set -o errexit
+
+CMD="/usr/bin/gnocchi-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 "gnocchi-manage db_sync" gnocchi
+    exit 0
+fi
+
+exec $CMD $ARGS
+
diff --git a/docker_templates/gnocchi/gnocchi-statsd/config-external.sh b/docker_templates/gnocchi/gnocchi-statsd/config-external.sh
deleted file mode 120000
index a3d14b10e5..0000000000
--- a/docker_templates/gnocchi/gnocchi-statsd/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../docker/common/gnocchi/gnocchi-statsd/config-external.sh
\ No newline at end of file
diff --git a/docker_templates/gnocchi/gnocchi-statsd/config-external.sh b/docker_templates/gnocchi/gnocchi-statsd/config-external.sh
new file mode 100644
index 0000000000..59639ba637
--- /dev/null
+++ b/docker_templates/gnocchi/gnocchi-statsd/config-external.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+SOURCE="/opt/kolla/gnocchi-api/gnocchi-api.conf"
+TARGET="/etc/gnocchi/gnocchi-api.conf"
+OWNER="gnocchi"
+
+if [[ -f "$SOURCE" ]]; then
+    cp $SOURCE $TARGET
+    chown ${OWNER}: $TARGET
+    chmod 0644 $TARGET
+fi
diff --git a/docker_templates/gnocchi/gnocchi-statsd/start.sh b/docker_templates/gnocchi/gnocchi-statsd/start.sh
deleted file mode 120000
index d273687080..0000000000
--- a/docker_templates/gnocchi/gnocchi-statsd/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../docker/common/gnocchi/gnocchi-statsd/start.sh
\ No newline at end of file
diff --git a/docker_templates/gnocchi/gnocchi-statsd/start.sh b/docker_templates/gnocchi/gnocchi-statsd/start.sh
new file mode 100755
index 0000000000..636e713238
--- /dev/null
+++ b/docker_templates/gnocchi/gnocchi-statsd/start.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+set -o errexit
+
+CMD="/usr/bin/gnocchi-statsd"
+ARGS=""
+
+# Loading common functions.
+source /opt/kolla/kolla-common.sh
+
+# Execute config strategy
+set_configs
+
+exec $CMD $ARGS
+