diff --git a/Dockerfile b/Dockerfile
index 73b4e3a..8da1698 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -33,8 +33,11 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/* \
     && rm -rf /tmp/ttyd
 
+ENV TINI_VERSION v0.18.0
+ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
+RUN chmod +x /tini
+
 EXPOSE 7681
 
-ENTRYPOINT ["ttyd"]
-
-CMD ["bash"]
+ENTRYPOINT ["/tini", "--"]
+CMD ["ttyd", "bash"]
diff --git a/Dockerfile-alpine b/Dockerfile-alpine
index b427373..f5964d8 100644
--- a/Dockerfile-alpine
+++ b/Dockerfile-alpine
@@ -4,10 +4,10 @@ LABEL maintainer "Shuanglei Tao - tsl0922@gmail.com" \
 
 RUN apk add --no-cache \
     bash \
+    tini \
     ttyd
 
 EXPOSE 7681
 
-ENTRYPOINT ["ttyd"]
-
-CMD ["bash"]
+ENTRYPOINT ["/sbin/tini", "--"]
+CMD ["ttyd", "bash"]