diff --git a/docker/deploy/cpu/centos7/Dockerfile b/docker/deploy/cpu/centos7/Dockerfile
index fe3f255128..3befef3b2f 100644
--- a/docker/deploy/cpu/centos7/Dockerfile
+++ b/docker/deploy/cpu/centos7/Dockerfile
@@ -26,6 +26,11 @@ COPY --from=openblas /usr/lib/libopenblas-r0.3.9.so /var/lib/milvus/lib/
 RUN ln -s /var/lib/milvus/lib/libopenblas-r0.3.9.so /var/lib/milvus/lib/libopenblas.so.0 && \
     ln -s /var/lib/milvus/lib/libopenblas.so.0 /var/lib/milvus/lib/libopenblas.so
 
+RUN wget -O /tini https://github.com/krallin/tini/releases/download/v0.19.0/tini && \
+    chmod +x /tini
+
+ENTRYPOINT ["/tini", "--"]
+
 WORKDIR /var/lib/milvus
 
 CMD [ "/var/lib/milvus/bin/milvus_server", "-c", "/var/lib/milvus/conf/milvus.yaml" ]
diff --git a/docker/deploy/cpu/ubuntu16.04/Dockerfile b/docker/deploy/cpu/ubuntu16.04/Dockerfile
index 44e6d4ad6f..72a95920ff 100644
--- a/docker/deploy/cpu/ubuntu16.04/Dockerfile
+++ b/docker/deploy/cpu/ubuntu16.04/Dockerfile
@@ -21,6 +21,11 @@ RUN ln -s /usr/lib/x86_64-linux-gnu/libmysqlclient.so /usr/lib/x86_64-linux-gnu/
 COPY ./milvus /var/lib/milvus
 ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/var/lib/milvus/lib"
 
+RUN wget -O /tini https://github.com/krallin/tini/releases/download/v0.19.0/tini && \
+    chmod +x /tini
+
+ENTRYPOINT ["/tini", "--"]
+
 WORKDIR /var/lib/milvus
 
 CMD [ "/var/lib/milvus/bin/milvus_server", "-c", "/var/lib/milvus/conf/milvus.yaml" ]
diff --git a/docker/deploy/cpu/ubuntu18.04/Dockerfile b/docker/deploy/cpu/ubuntu18.04/Dockerfile
index 15a6fb97ad..a31831d520 100644
--- a/docker/deploy/cpu/ubuntu18.04/Dockerfile
+++ b/docker/deploy/cpu/ubuntu18.04/Dockerfile
@@ -27,6 +27,11 @@ COPY --from=openblas /usr/lib/libopenblas-r0.3.9.so /var/lib/milvus/lib/
 RUN ln -s /var/lib/milvus/lib/libopenblas-r0.3.9.so /var/lib/milvus/lib/libopenblas.so.0 && \
     ln -s /var/lib/milvus/lib/libopenblas.so.0 /var/lib/milvus/lib/libopenblas.so
 
+RUN wget -O /tini https://github.com/krallin/tini/releases/download/v0.19.0/tini && \
+    chmod +x /tini
+
+ENTRYPOINT ["/tini", "--"]
+
 WORKDIR /var/lib/milvus
 
 CMD [ "/var/lib/milvus/bin/milvus_server", "-c", "/var/lib/milvus/conf/milvus.yaml" ]
diff --git a/docker/deploy/gpu/centos7/Dockerfile b/docker/deploy/gpu/centos7/Dockerfile
index 745ba820fe..5dbfb41699 100644
--- a/docker/deploy/gpu/centos7/Dockerfile
+++ b/docker/deploy/gpu/centos7/Dockerfile
@@ -28,6 +28,11 @@ COPY --from=openblas /usr/lib/libopenblas-r0.3.9.so /var/lib/milvus/lib/
 RUN ln -s /var/lib/milvus/lib/libopenblas-r0.3.9.so /var/lib/milvus/lib/libopenblas.so.0 && \
     ln -s /var/lib/milvus/lib/libopenblas.so.0 /var/lib/milvus/lib/libopenblas.so
 
+RUN wget -O /tini https://github.com/krallin/tini/releases/download/v0.19.0/tini && \
+    chmod +x /tini
+
+ENTRYPOINT ["/tini", "--"]
+
 WORKDIR /var/lib/milvus
 
 CMD [ "/var/lib/milvus/bin/milvus_server", "-c", "/var/lib/milvus/conf/milvus.yaml" ]
diff --git a/docker/deploy/gpu/ubuntu16.04/Dockerfile b/docker/deploy/gpu/ubuntu16.04/Dockerfile
index dbe5e5b9c4..9194e3a2c9 100644
--- a/docker/deploy/gpu/ubuntu16.04/Dockerfile
+++ b/docker/deploy/gpu/ubuntu16.04/Dockerfile
@@ -25,6 +25,11 @@ RUN ln -s /usr/lib/x86_64-linux-gnu/libmysqlclient.so /usr/lib/x86_64-linux-gnu/
 COPY ./milvus /var/lib/milvus
 ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/var/lib/milvus/lib"
 
+RUN wget -O /tini https://github.com/krallin/tini/releases/download/v0.19.0/tini && \
+    chmod +x /tini
+
+ENTRYPOINT ["/tini", "--"]
+
 WORKDIR /var/lib/milvus
 
 CMD [ "/var/lib/milvus/bin/milvus_server", "-c", "/var/lib/milvus/conf/milvus.yaml" ]
diff --git a/docker/deploy/gpu/ubuntu18.04/Dockerfile b/docker/deploy/gpu/ubuntu18.04/Dockerfile
index a109ae9820..bc34f52824 100644
--- a/docker/deploy/gpu/ubuntu18.04/Dockerfile
+++ b/docker/deploy/gpu/ubuntu18.04/Dockerfile
@@ -31,6 +31,11 @@ COPY --from=openblas /usr/lib/libopenblas-r0.3.9.so /var/lib/milvus/lib/
 RUN ln -s /var/lib/milvus/lib/libopenblas-r0.3.9.so /var/lib/milvus/lib/libopenblas.so.0 && \
     ln -s /var/lib/milvus/lib/libopenblas.so.0 /var/lib/milvus/lib/libopenblas.so
 
+RUN wget -O /tini https://github.com/krallin/tini/releases/download/v0.19.0/tini && \
+    chmod +x /tini
+
+ENTRYPOINT ["/tini", "--"]
+
 WORKDIR /var/lib/milvus
 
 CMD [ "/var/lib/milvus/bin/milvus_server", "-c", "/var/lib/milvus/conf/milvus.yaml" ]