diff --git a/docker/Dockerfile b/docker/Dockerfile
index 592d012..2212eb5 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -220,8 +220,11 @@ RUN source /opt/ros/$ROS_DISTRO/setup.bash && \
 RUN echo "source /opt/ros/$ROS_DISTRO/setup.bash" >> ~/.bashrc
 
 # set entrypoint
+ENV TINI_VERSION v0.19.0
+ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${TARGETARCH} /tini
+RUN chmod +x /tini
 COPY docker/docker-ros/docker/entrypoint.sh /
-ENTRYPOINT ["/entrypoint.sh"]
+ENTRYPOINT ["/tini", "--", "/entrypoint.sh"]
 
 ############ dev ###############################################################
 FROM dependencies-install as dev