diff --git a/docker/alpine.Dockerfile b/docker/alpine.Dockerfile
index 2ca6798..f586f62 100644
--- a/docker/alpine.Dockerfile
+++ b/docker/alpine.Dockerfile
@@ -13,6 +13,7 @@ RUN --mount=type=cache,target=/var/cache/apk,sharing=locked \
     mariadb-connector-c \
     openssl \
     python3 \
+    tini \
     tzdata \
     zeromq \
     zlib
diff --git a/docker/ubuntu.Dockerfile b/docker/ubuntu.Dockerfile
index 5095e82..74018ef 100644
--- a/docker/ubuntu.Dockerfile
+++ b/docker/ubuntu.Dockerfile
@@ -19,6 +19,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
     libzmq5 \
     mariadb-client \
     python3 \
+    tini \
     tzdata \
     zlib1g
 
diff --git a/entrypoint.sh b/entrypoint.sh
index 8273dd8..6fb998c 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -11,4 +11,4 @@ export XI_NETWORK_SQL_PASSWORD
 export XI_NETWORK_SQL_LOGIN
 export XI_NETWORK_SQL_DATABASE
 
-exec "$@"
+exec /usr/bin/tini -- "$@"