diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index d6b8c3ca03..c53a635b94 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -394,8 +394,7 @@ COPY curlrc /root/.curlrc
 {% if base_arch == 'x86_64' %}
 
 RUN curl -sSL https://github.com/Yelp/dumb-init/releases/download/v1.1.3/dumb-init_1.1.3_amd64 -o /usr/local/bin/dumb-init \
-    && chmod +x /usr/local/bin/dumb-init \
-    && sed -i 's|#!|#!/usr/local/bin/dumb-init |' /usr/local/bin/kolla_start
+    && chmod +x /usr/local/bin/dumb-init
 
 {% else %}
 
@@ -405,10 +404,12 @@ RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
     && python get-pip.py \
     && rm get-pip.py \
     && pip --no-cache-dir install  --prefix='/usr/local' dumb-init==1.1.3 \
-    && chmod +x /usr/local/bin/dumb-init \
-    && sed -i 's|#!|#!/usr/local/bin/dumb-init |' /usr/local/bin/kolla_start
+    && chmod +x /usr/local/bin/dumb-init
 
 {% endif %}
+
+ENTRYPOINT ["dumb-init", "--single-child", "--"]
+
 {% endblock %}
 
 RUN touch /usr/local/bin/kolla_extend_start \