diff --git a/docker/common/nova/nova-api/config-external.sh b/docker/common/nova/nova-api/config-external.sh
deleted file mode 100755
index d0859893d9..0000000000
--- a/docker/common/nova/nova-api/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/nova-api/nova.conf"
-TARGET="/etc/nova/nova.conf"
-OWNER="nova"
-
-if [[ -f "$SOURCE" ]]; then
-    cp $SOURCE $TARGET
-    chown ${OWNER}: $TARGET
-    chmod 0644 $TARGET
-fi
diff --git a/docker/common/nova/nova-api/start.sh b/docker/common/nova/nova-api/start.sh
deleted file mode 100755
index ad25ba65c2..0000000000
--- a/docker/common/nova/nova-api/start.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-CMD="/usr/bin/nova-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 "nova-manage db sync" nova
-    exit 0
-fi
-
-exec $CMD $ARGS
diff --git a/docker/common/nova/nova-compute/config-external.sh b/docker/common/nova/nova-compute/config-external.sh
deleted file mode 100755
index e844bf50c2..0000000000
--- a/docker/common/nova/nova-compute/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/nova-compute/nova.conf"
-TARGET="/etc/nova/nova.conf"
-OWNER="nova"
-
-if [[ -f "$SOURCE" ]]; then
-    cp $SOURCE $TARGET
-    chown ${OWNER}: $TARGET
-    chmod 0644 $TARGET
-fi
diff --git a/docker/common/nova/nova-compute/start.sh b/docker/common/nova/nova-compute/start.sh
deleted file mode 100755
index 48e77542b8..0000000000
--- a/docker/common/nova/nova-compute/start.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-CMD="/usr/bin/nova-compute"
-ARGS=""
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-# Execute config strategy
-set_configs
-
-exec $CMD $ARGS
diff --git a/docker/common/nova/nova-conductor/config-external.sh b/docker/common/nova/nova-conductor/config-external.sh
deleted file mode 100755
index ea3b123ec7..0000000000
--- a/docker/common/nova/nova-conductor/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/nova-conductor/nova.conf"
-TARGET="/etc/nova/nova.conf"
-OWNER="nova"
-
-if [[ -f "$SOURCE" ]]; then
-    cp $SOURCE $TARGET
-    chown ${OWNER}: $TARGET
-    chmod 0644 $TARGET
-fi
diff --git a/docker/common/nova/nova-conductor/start.sh b/docker/common/nova/nova-conductor/start.sh
deleted file mode 100755
index 1fe7d05866..0000000000
--- a/docker/common/nova/nova-conductor/start.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-CMD="/usr/bin/nova-conductor"
-ARGS=""
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-# Execute config strategy
-set_configs
-
-exec $CMD $ARGS
diff --git a/docker/common/nova/nova-consoleauth/config-external.sh b/docker/common/nova/nova-consoleauth/config-external.sh
deleted file mode 100755
index 1da10d83f2..0000000000
--- a/docker/common/nova/nova-consoleauth/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/nova-consoleauth/nova.conf"
-TARGET="/etc/nova/nova.conf"
-OWNER="nova"
-
-if [[ -f "$SOURCE" ]]; then
-    cp $SOURCE $TARGET
-    chown ${OWNER}: $TARGET
-    chmod 0644 $TARGET
-fi
diff --git a/docker/common/nova/nova-consoleauth/start.sh b/docker/common/nova/nova-consoleauth/start.sh
deleted file mode 100755
index 1abccde19e..0000000000
--- a/docker/common/nova/nova-consoleauth/start.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-CMD="/usr/bin/nova-consoleauth"
-ARGS=""
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-# Execute config strategy
-set_configs
-
-exec $CMD $ARGS
diff --git a/docker/common/nova/nova-libvirt/config-external.sh b/docker/common/nova/nova-libvirt/config-external.sh
deleted file mode 100755
index acc1c5473b..0000000000
--- a/docker/common/nova/nova-libvirt/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/libvirt/libvirtd.conf"
-TARGET="/etc/libvirt/libvirtd.conf"
-OWNER="libvirt"
-
-if [[ -f "$SOURCE" ]]; then
-    cp $SOURCE $TARGET
-    chown ${OWNER}: $TARGET
-    chmod 0644 $TARGET
-fi
diff --git a/docker/common/nova/nova-libvirt/start.sh b/docker/common/nova/nova-libvirt/start.sh
deleted file mode 100755
index ae0de867b5..0000000000
--- a/docker/common/nova/nova-libvirt/start.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-CMD="/usr/sbin/libvirtd"
-ARGS=""
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-# Execute config strategy
-set_configs
-
-# TODO(SamYaple): Tweak libvirt.conf rather than change permissions.
-# Fix permissions for libvirt
-if [[ -c /dev/kvm ]]; then
-    chmod 660 /dev/kvm
-    chown root:kvm /dev/kvm
-fi
-
-exec $CMD $ARGS
diff --git a/docker/common/nova/nova-network/config-external.sh b/docker/common/nova/nova-network/config-external.sh
deleted file mode 100755
index 7c1d6bb377..0000000000
--- a/docker/common/nova/nova-network/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/nova-network/nova.conf"
-TARGET="/etc/nova/nova.conf"
-OWNER="nova"
-
-if [[ -f "$SOURCE" ]]; then
-    cp $SOURCE $TARGET
-    chown ${OWNER}: $TARGET
-    chmod 0644 $TARGET
-fi
diff --git a/docker/common/nova/nova-network/start.sh b/docker/common/nova/nova-network/start.sh
deleted file mode 100755
index 88f941b337..0000000000
--- a/docker/common/nova/nova-network/start.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-CMD="/usr/bin/nova-network"
-ARGS=""
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-# Execute config strategy
-set_configs
-
-exec $CMD $ARGS
diff --git a/docker/common/nova/nova-novncproxy/config-external.sh b/docker/common/nova/nova-novncproxy/config-external.sh
deleted file mode 100755
index fdc33a5bdc..0000000000
--- a/docker/common/nova/nova-novncproxy/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/nova-novncproxy/nova.conf"
-TARGET="/etc/nova/nova.conf"
-OWNER="nova"
-
-if [[ -f "$SOURCE" ]]; then
-    cp $SOURCE $TARGET
-    chown ${OWNER}: $TARGET
-    chmod 0644 $TARGET
-fi
diff --git a/docker/common/nova/nova-novncproxy/start.sh b/docker/common/nova/nova-novncproxy/start.sh
deleted file mode 100755
index 6e59d12533..0000000000
--- a/docker/common/nova/nova-novncproxy/start.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-CMD="/usr/bin/nova-novncproxy"
-ARGS=""
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-# Execute config strategy
-set_configs
-
-exec $CMD $ARGS
diff --git a/docker/common/nova/nova-scheduler/config-external.sh b/docker/common/nova/nova-scheduler/config-external.sh
deleted file mode 100755
index 3df0f9b7bb..0000000000
--- a/docker/common/nova/nova-scheduler/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/nova-scheduler/nova.conf"
-TARGET="/etc/nova/nova.conf"
-OWNER="nova"
-
-if [[ -f "$SOURCE" ]]; then
-    cp $SOURCE $TARGET
-    chown ${OWNER}: $TARGET
-    chmod 0644 $TARGET
-fi
diff --git a/docker/common/nova/nova-scheduler/start.sh b/docker/common/nova/nova-scheduler/start.sh
deleted file mode 100755
index d9b3e14eb7..0000000000
--- a/docker/common/nova/nova-scheduler/start.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-CMD="/usr/bin/nova-scheduler"
-ARGS=""
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-# Execute config strategy
-set_configs
-
-exec $CMD $ARGS
diff --git a/docker_templates/nova/nova-api/config-external.sh b/docker_templates/nova/nova-api/config-external.sh
deleted file mode 120000
index bfa5b09c03..0000000000
--- a/docker_templates/nova/nova-api/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../docker/common/nova/nova-api/config-external.sh
\ No newline at end of file
diff --git a/docker_templates/nova/nova-api/config-external.sh b/docker_templates/nova/nova-api/config-external.sh
new file mode 100755
index 0000000000..d0859893d9
--- /dev/null
+++ b/docker_templates/nova/nova-api/config-external.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+SOURCE="/opt/kolla/nova-api/nova.conf"
+TARGET="/etc/nova/nova.conf"
+OWNER="nova"
+
+if [[ -f "$SOURCE" ]]; then
+    cp $SOURCE $TARGET
+    chown ${OWNER}: $TARGET
+    chmod 0644 $TARGET
+fi
diff --git a/docker_templates/nova/nova-api/start.sh b/docker_templates/nova/nova-api/start.sh
deleted file mode 120000
index e4407856ea..0000000000
--- a/docker_templates/nova/nova-api/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../docker/common/nova/nova-api/start.sh
\ No newline at end of file
diff --git a/docker_templates/nova/nova-api/start.sh b/docker_templates/nova/nova-api/start.sh
new file mode 100755
index 0000000000..ad25ba65c2
--- /dev/null
+++ b/docker_templates/nova/nova-api/start.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+set -o errexit
+
+CMD="/usr/bin/nova-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 "nova-manage db sync" nova
+    exit 0
+fi
+
+exec $CMD $ARGS
diff --git a/docker_templates/nova/nova-compute/config-external.sh b/docker_templates/nova/nova-compute/config-external.sh
deleted file mode 120000
index f048280043..0000000000
--- a/docker_templates/nova/nova-compute/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../docker/common/nova/nova-compute/config-external.sh
\ No newline at end of file
diff --git a/docker_templates/nova/nova-compute/config-external.sh b/docker_templates/nova/nova-compute/config-external.sh
new file mode 100755
index 0000000000..e844bf50c2
--- /dev/null
+++ b/docker_templates/nova/nova-compute/config-external.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+SOURCE="/opt/kolla/nova-compute/nova.conf"
+TARGET="/etc/nova/nova.conf"
+OWNER="nova"
+
+if [[ -f "$SOURCE" ]]; then
+    cp $SOURCE $TARGET
+    chown ${OWNER}: $TARGET
+    chmod 0644 $TARGET
+fi
diff --git a/docker_templates/nova/nova-compute/start.sh b/docker_templates/nova/nova-compute/start.sh
deleted file mode 120000
index 6745e03e6b..0000000000
--- a/docker_templates/nova/nova-compute/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../docker/common/nova/nova-compute/start.sh
\ No newline at end of file
diff --git a/docker_templates/nova/nova-compute/start.sh b/docker_templates/nova/nova-compute/start.sh
new file mode 100755
index 0000000000..48e77542b8
--- /dev/null
+++ b/docker_templates/nova/nova-compute/start.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+set -o errexit
+
+CMD="/usr/bin/nova-compute"
+ARGS=""
+
+# Loading common functions.
+source /opt/kolla/kolla-common.sh
+
+# Execute config strategy
+set_configs
+
+exec $CMD $ARGS
diff --git a/docker_templates/nova/nova-conductor/config-external.sh b/docker_templates/nova/nova-conductor/config-external.sh
deleted file mode 120000
index 0f8937e2d4..0000000000
--- a/docker_templates/nova/nova-conductor/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../docker/common/nova/nova-conductor/config-external.sh
\ No newline at end of file
diff --git a/docker_templates/nova/nova-conductor/config-external.sh b/docker_templates/nova/nova-conductor/config-external.sh
new file mode 100755
index 0000000000..ea3b123ec7
--- /dev/null
+++ b/docker_templates/nova/nova-conductor/config-external.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+SOURCE="/opt/kolla/nova-conductor/nova.conf"
+TARGET="/etc/nova/nova.conf"
+OWNER="nova"
+
+if [[ -f "$SOURCE" ]]; then
+    cp $SOURCE $TARGET
+    chown ${OWNER}: $TARGET
+    chmod 0644 $TARGET
+fi
diff --git a/docker_templates/nova/nova-conductor/start.sh b/docker_templates/nova/nova-conductor/start.sh
deleted file mode 120000
index bd27c26817..0000000000
--- a/docker_templates/nova/nova-conductor/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../docker/common/nova/nova-conductor/start.sh
\ No newline at end of file
diff --git a/docker_templates/nova/nova-conductor/start.sh b/docker_templates/nova/nova-conductor/start.sh
new file mode 100755
index 0000000000..1fe7d05866
--- /dev/null
+++ b/docker_templates/nova/nova-conductor/start.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+set -o errexit
+
+CMD="/usr/bin/nova-conductor"
+ARGS=""
+
+# Loading common functions.
+source /opt/kolla/kolla-common.sh
+
+# Execute config strategy
+set_configs
+
+exec $CMD $ARGS
diff --git a/docker_templates/nova/nova-consoleauth/config-external.sh b/docker_templates/nova/nova-consoleauth/config-external.sh
deleted file mode 120000
index 90fedb172c..0000000000
--- a/docker_templates/nova/nova-consoleauth/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../docker/common/nova/nova-consoleauth/config-external.sh
\ No newline at end of file
diff --git a/docker_templates/nova/nova-consoleauth/config-external.sh b/docker_templates/nova/nova-consoleauth/config-external.sh
new file mode 100755
index 0000000000..1da10d83f2
--- /dev/null
+++ b/docker_templates/nova/nova-consoleauth/config-external.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+SOURCE="/opt/kolla/nova-consoleauth/nova.conf"
+TARGET="/etc/nova/nova.conf"
+OWNER="nova"
+
+if [[ -f "$SOURCE" ]]; then
+    cp $SOURCE $TARGET
+    chown ${OWNER}: $TARGET
+    chmod 0644 $TARGET
+fi
diff --git a/docker_templates/nova/nova-consoleauth/start.sh b/docker_templates/nova/nova-consoleauth/start.sh
deleted file mode 120000
index 23339e5d9c..0000000000
--- a/docker_templates/nova/nova-consoleauth/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../docker/common/nova/nova-consoleauth/start.sh
\ No newline at end of file
diff --git a/docker_templates/nova/nova-consoleauth/start.sh b/docker_templates/nova/nova-consoleauth/start.sh
new file mode 100755
index 0000000000..1abccde19e
--- /dev/null
+++ b/docker_templates/nova/nova-consoleauth/start.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+set -o errexit
+
+CMD="/usr/bin/nova-consoleauth"
+ARGS=""
+
+# Loading common functions.
+source /opt/kolla/kolla-common.sh
+
+# Execute config strategy
+set_configs
+
+exec $CMD $ARGS
diff --git a/docker_templates/nova/nova-libvirt/config-external.sh b/docker_templates/nova/nova-libvirt/config-external.sh
deleted file mode 120000
index cdcc6cc68c..0000000000
--- a/docker_templates/nova/nova-libvirt/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../docker/common/nova/nova-libvirt/config-external.sh
\ No newline at end of file
diff --git a/docker_templates/nova/nova-libvirt/config-external.sh b/docker_templates/nova/nova-libvirt/config-external.sh
new file mode 100755
index 0000000000..acc1c5473b
--- /dev/null
+++ b/docker_templates/nova/nova-libvirt/config-external.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+SOURCE="/opt/kolla/libvirt/libvirtd.conf"
+TARGET="/etc/libvirt/libvirtd.conf"
+OWNER="libvirt"
+
+if [[ -f "$SOURCE" ]]; then
+    cp $SOURCE $TARGET
+    chown ${OWNER}: $TARGET
+    chmod 0644 $TARGET
+fi
diff --git a/docker_templates/nova/nova-libvirt/start.sh b/docker_templates/nova/nova-libvirt/start.sh
deleted file mode 120000
index 8188547e1d..0000000000
--- a/docker_templates/nova/nova-libvirt/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../docker/common/nova/nova-libvirt/start.sh
\ No newline at end of file
diff --git a/docker_templates/nova/nova-libvirt/start.sh b/docker_templates/nova/nova-libvirt/start.sh
new file mode 100755
index 0000000000..ae0de867b5
--- /dev/null
+++ b/docker_templates/nova/nova-libvirt/start.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+set -o errexit
+
+CMD="/usr/sbin/libvirtd"
+ARGS=""
+
+# Loading common functions.
+source /opt/kolla/kolla-common.sh
+
+# Execute config strategy
+set_configs
+
+# TODO(SamYaple): Tweak libvirt.conf rather than change permissions.
+# Fix permissions for libvirt
+if [[ -c /dev/kvm ]]; then
+    chmod 660 /dev/kvm
+    chown root:kvm /dev/kvm
+fi
+
+exec $CMD $ARGS
diff --git a/docker_templates/nova/nova-network/config-external.sh b/docker_templates/nova/nova-network/config-external.sh
deleted file mode 120000
index 02cf8efee9..0000000000
--- a/docker_templates/nova/nova-network/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../docker/common/nova/nova-network/config-external.sh
\ No newline at end of file
diff --git a/docker_templates/nova/nova-network/config-external.sh b/docker_templates/nova/nova-network/config-external.sh
new file mode 100755
index 0000000000..7c1d6bb377
--- /dev/null
+++ b/docker_templates/nova/nova-network/config-external.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+SOURCE="/opt/kolla/nova-network/nova.conf"
+TARGET="/etc/nova/nova.conf"
+OWNER="nova"
+
+if [[ -f "$SOURCE" ]]; then
+    cp $SOURCE $TARGET
+    chown ${OWNER}: $TARGET
+    chmod 0644 $TARGET
+fi
diff --git a/docker_templates/nova/nova-network/start.sh b/docker_templates/nova/nova-network/start.sh
deleted file mode 120000
index ce608a5d46..0000000000
--- a/docker_templates/nova/nova-network/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../docker/common/nova/nova-network/start.sh
\ No newline at end of file
diff --git a/docker_templates/nova/nova-network/start.sh b/docker_templates/nova/nova-network/start.sh
new file mode 100755
index 0000000000..88f941b337
--- /dev/null
+++ b/docker_templates/nova/nova-network/start.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+set -o errexit
+
+CMD="/usr/bin/nova-network"
+ARGS=""
+
+# Loading common functions.
+source /opt/kolla/kolla-common.sh
+
+# Execute config strategy
+set_configs
+
+exec $CMD $ARGS
diff --git a/docker_templates/nova/nova-novncproxy/config-external.sh b/docker_templates/nova/nova-novncproxy/config-external.sh
deleted file mode 120000
index 87797c27cc..0000000000
--- a/docker_templates/nova/nova-novncproxy/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../docker/common/nova/nova-novncproxy/config-external.sh
\ No newline at end of file
diff --git a/docker_templates/nova/nova-novncproxy/config-external.sh b/docker_templates/nova/nova-novncproxy/config-external.sh
new file mode 100755
index 0000000000..fdc33a5bdc
--- /dev/null
+++ b/docker_templates/nova/nova-novncproxy/config-external.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+SOURCE="/opt/kolla/nova-novncproxy/nova.conf"
+TARGET="/etc/nova/nova.conf"
+OWNER="nova"
+
+if [[ -f "$SOURCE" ]]; then
+    cp $SOURCE $TARGET
+    chown ${OWNER}: $TARGET
+    chmod 0644 $TARGET
+fi
diff --git a/docker_templates/nova/nova-novncproxy/start.sh b/docker_templates/nova/nova-novncproxy/start.sh
deleted file mode 120000
index 36d3f1a459..0000000000
--- a/docker_templates/nova/nova-novncproxy/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../docker/common/nova/nova-novncproxy/start.sh
\ No newline at end of file
diff --git a/docker_templates/nova/nova-novncproxy/start.sh b/docker_templates/nova/nova-novncproxy/start.sh
new file mode 100755
index 0000000000..6e59d12533
--- /dev/null
+++ b/docker_templates/nova/nova-novncproxy/start.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+set -o errexit
+
+CMD="/usr/bin/nova-novncproxy"
+ARGS=""
+
+# Loading common functions.
+source /opt/kolla/kolla-common.sh
+
+# Execute config strategy
+set_configs
+
+exec $CMD $ARGS
diff --git a/docker_templates/nova/nova-scheduler/config-external.sh b/docker_templates/nova/nova-scheduler/config-external.sh
deleted file mode 120000
index 4021bbbdad..0000000000
--- a/docker_templates/nova/nova-scheduler/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../docker/common/nova/nova-scheduler/config-external.sh
\ No newline at end of file
diff --git a/docker_templates/nova/nova-scheduler/config-external.sh b/docker_templates/nova/nova-scheduler/config-external.sh
new file mode 100755
index 0000000000..3df0f9b7bb
--- /dev/null
+++ b/docker_templates/nova/nova-scheduler/config-external.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+SOURCE="/opt/kolla/nova-scheduler/nova.conf"
+TARGET="/etc/nova/nova.conf"
+OWNER="nova"
+
+if [[ -f "$SOURCE" ]]; then
+    cp $SOURCE $TARGET
+    chown ${OWNER}: $TARGET
+    chmod 0644 $TARGET
+fi
diff --git a/docker_templates/nova/nova-scheduler/start.sh b/docker_templates/nova/nova-scheduler/start.sh
deleted file mode 120000
index cd22061913..0000000000
--- a/docker_templates/nova/nova-scheduler/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../docker/common/nova/nova-scheduler/start.sh
\ No newline at end of file
diff --git a/docker_templates/nova/nova-scheduler/start.sh b/docker_templates/nova/nova-scheduler/start.sh
new file mode 100755
index 0000000000..d9b3e14eb7
--- /dev/null
+++ b/docker_templates/nova/nova-scheduler/start.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+set -o errexit
+
+CMD="/usr/bin/nova-scheduler"
+ARGS=""
+
+# Loading common functions.
+source /opt/kolla/kolla-common.sh
+
+# Execute config strategy
+set_configs
+
+exec $CMD $ARGS