diff --git a/Dockerfile.m4 b/Dockerfile.m4
index 225d2e2..0357604 100644
--- a/Dockerfile.m4
+++ b/Dockerfile.m4
@@ -253,7 +253,7 @@ RUN make -j"$(nproc)"
 RUN checkinstall --default --pkgname=xrdp-pulseaudio --pkgversion=9:999 --pkgrelease=0
 
 ##################################################
-## "xubuntu" stage
+## "main" stage
 ##################################################
 
 m4_ifdef([[CROSS_ARCH]], [[FROM docker.io/CROSS_ARCH/ubuntu:22.04]], [[FROM docker.io/ubuntu:22.04]]) AS main
@@ -268,6 +268,7 @@ m4_ifelse(ENABLE_32BIT_SUPPORT, 1, [[m4_dnl
 	&& apt-get install -y --no-install-recommends -o APT::Immediate-Configure=0 \
 		at-spi2-core \
 		ca-certificates \
+		catatonit \
 		dbus \
 		dbus-x11 \
 		libbz2-1.0 \
@@ -314,7 +315,6 @@ m4_ifelse(ENABLE_32BIT_SUPPORT, 1, [[m4_dnl
 		policykit-1 \
 		pulseaudio \
 		runit \
-		tini \
 		tzdata \
 		udev \
 		xauth \
diff --git a/scripts/bin/container-init b/scripts/bin/container-init
index 8d15efc..819b24e 100755
--- a/scripts/bin/container-init
+++ b/scripts/bin/container-init
@@ -126,4 +126,4 @@ openssl x509 -in "${XRDP_TLS_CRT_PATH:?}" -noout -fingerprint -sha256
 env | grep -Ev '^(PWD|OLDPWD|HOME|USER|SHELL|TERM|([^=]*(PASSWORD|SECRET)[^=]*))=' | sort > /etc/environment
 
 # Start runit
-exec tini -- runsvdir -P /etc/service/
+exec catatonit -- runsvdir -P /etc/service/