diff --git a/docker/etcd/extend_start.sh b/docker/etcd/extend_start.sh
index 718de9ebbd..c540232995 100644
--- a/docker/etcd/extend_start.sh
+++ b/docker/etcd/extend_start.sh
@@ -8,9 +8,6 @@ if [[ $(stat -c %a /var/log/kolla/etcd) != "755" ]]; then
     chmod 755 /var/log/kolla/etcd
 fi
 
-# 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
+if [[ $(stat -c %U /var/lib/etcd/) != "etcd" ]]; then
     sudo chown etcd: /var/lib/etcd/
-    exit 0
 fi