diff --git a/Dockerfile.m4 b/Dockerfile.m4
index fa7f0c5..f12ae19 100644
--- a/Dockerfile.m4
+++ b/Dockerfile.m4
@@ -99,6 +99,7 @@ m4_ifdef([[CROSS_QEMU]], [[COPY --from=docker.io/hectorm/qemu-user-static:latest
 RUN export DEBIAN_FRONTEND=noninteractive \
 	&& apt-get update \
 	&& apt-get install -y --no-install-recommends \
+		catatonit \
 		net-tools \
 		netcat-openbsd \
 		procps \
@@ -108,7 +109,6 @@ RUN export DEBIAN_FRONTEND=noninteractive \
 		rlwrap \
 		runit \
 		samba \
-		tini \
 	&& rm -rf /var/lib/apt/lists/*
 
 # Environment
@@ -143,7 +143,7 @@ COPY --chown=root:root ./scripts/bin/ /usr/local/bin/
 RUN find /usr/local/bin/ -type d -not -perm 0755 -exec chmod 0755 '{}' ';'
 RUN find /usr/local/bin/ -type f -not -perm 0755 -exec chmod 0755 '{}' ';'
 
-ENTRYPOINT ["/usr/bin/tini", "--", "/usr/local/bin/container-init"]
+ENTRYPOINT ["/usr/bin/catatonit", "--", "/usr/local/bin/container-init"]
 
 ##################################################
 ## "test" stage