diff --git a/.gitignore b/.gitignore
index 1cdba5be70..f3b4b08ab3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ integration_tests/dist_query/output
 .tools
 bin
 coverage.txt
+tini
diff --git a/Dockerfile b/Dockerfile
index 0de3d643b4..6e94e51a70 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -46,7 +46,8 @@ RUN chmod +x /usr/bin/horaedb-server
 COPY ./docker/entrypoint.sh /entrypoint.sh
 COPY ./docs/minimal.toml /etc/horaedb/horaedb.toml
 
-COPY ./docker/tini /tini
+ARG TINI_VERSION=v0.19.0
+ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
 RUN chmod +x /tini
 
 ARG USER=horae
diff --git a/docker/tini b/docker/tini
deleted file mode 100644
index 03af82f09e..0000000000
Binary files a/docker/tini and /dev/null differ
diff --git a/horaemeta/Dockerfile b/horaemeta/Dockerfile
index 5841c2a87e..9512582af7 100644
--- a/horaemeta/Dockerfile
+++ b/horaemeta/Dockerfile
@@ -44,7 +44,8 @@ RUN chmod +x /usr/bin/horaemeta-server
 COPY ./docker/entrypoint.sh /entrypoint.sh
 COPY ./config/example-standalone.toml /etc/horaemeta/horaemeta.toml
 
-COPY ./docker/tini /tini
+ARG TINI_VERSION=v0.19.0
+ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
 RUN chmod +x /tini
 
 ARG USER horae
diff --git a/horaemeta/docker/tini b/horaemeta/docker/tini
deleted file mode 100644
index 03af82f09e..0000000000
Binary files a/horaemeta/docker/tini and /dev/null differ