diff --git a/2019.12/apache/Dockerfile b/2019.12/apache/Dockerfile
index 9ec07ad..a9134b4 100644
--- a/2019.12/apache/Dockerfile
+++ b/2019.12/apache/Dockerfile
@@ -18,9 +18,10 @@ RUN set -ex; \
 
 # Add tini for reaping processes
 ENV TINI_VERSION v0.18.0
-ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH:-amd64} /sbin/tini
-ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH:-amd64}.asc /tini.asc
-RUN gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 \
+RUN export BUILD_ARCH=$(dpkg-architecture --query DEB_BUILD_ARCH) \
+ && curl -L -o /sbin/tini https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${BUILD_ARCH} \
+ && curl -L -o /tini.asc https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${BUILD_ARCH}.asc \
+ && gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 \
  && gpg --batch --verify /tini.asc /sbin/tini \
  && chmod +x /sbin/tini
 
diff --git a/2019.12/fpm/Dockerfile b/2019.12/fpm/Dockerfile
index dd81832..bf25cba 100644
--- a/2019.12/fpm/Dockerfile
+++ b/2019.12/fpm/Dockerfile
@@ -18,9 +18,10 @@ RUN set -ex; \
 
 # Add tini for reaping processes
 ENV TINI_VERSION v0.18.0
-ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH:-amd64} /sbin/tini
-ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH:-amd64}.asc /tini.asc
-RUN gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 \
+RUN export BUILD_ARCH=$(dpkg-architecture --query DEB_BUILD_ARCH) \
+ && curl -L -o /sbin/tini https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${BUILD_ARCH} \
+ && curl -L -o /tini.asc https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${BUILD_ARCH}.asc \
+ && gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 \
  && gpg --batch --verify /tini.asc /sbin/tini \
  && chmod +x /sbin/tini
 
diff --git a/2020.03-dev/apache/Dockerfile b/2020.03-dev/apache/Dockerfile
index 802ca7a..127cea3 100644
--- a/2020.03-dev/apache/Dockerfile
+++ b/2020.03-dev/apache/Dockerfile
@@ -18,9 +18,10 @@ RUN set -ex; \
 
 # Add tini for reaping processes
 ENV TINI_VERSION v0.18.0
-ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH:-amd64} /sbin/tini
-ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH:-amd64}.asc /tini.asc
-RUN gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 \
+RUN export BUILD_ARCH=$(dpkg-architecture --query DEB_BUILD_ARCH) \
+ && curl -L -o /sbin/tini https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${BUILD_ARCH} \
+ && curl -L -o /tini.asc https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${BUILD_ARCH}.asc \
+ && gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 \
  && gpg --batch --verify /tini.asc /sbin/tini \
  && chmod +x /sbin/tini
 
diff --git a/2020.03-dev/fpm/Dockerfile b/2020.03-dev/fpm/Dockerfile
index 1768324..cdfd485 100644
--- a/2020.03-dev/fpm/Dockerfile
+++ b/2020.03-dev/fpm/Dockerfile
@@ -18,9 +18,10 @@ RUN set -ex; \
 
 # Add tini for reaping processes
 ENV TINI_VERSION v0.18.0
-ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH:-amd64} /sbin/tini
-ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH:-amd64}.asc /tini.asc
-RUN gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 \
+RUN export BUILD_ARCH=$(dpkg-architecture --query DEB_BUILD_ARCH) \
+ && curl -L -o /sbin/tini https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${BUILD_ARCH} \
+ && curl -L -o /tini.asc https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${BUILD_ARCH}.asc \
+ && gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 \
  && gpg --batch --verify /tini.asc /sbin/tini \
  && chmod +x /sbin/tini
 
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
index 8c7be4a..2828a03 100644
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@@ -17,9 +17,10 @@ RUN set -ex; \
 
 # Add tini for reaping processes
 ENV TINI_VERSION v%%TINI_VERSION%%
-ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH:-amd64} /sbin/tini
-ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH:-amd64}.asc /tini.asc
-RUN gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 \
+RUN export BUILD_ARCH=$(dpkg-architecture --query DEB_BUILD_ARCH) \
+ && curl -L -o /sbin/tini https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${BUILD_ARCH} \
+ && curl -L -o /tini.asc https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${BUILD_ARCH}.asc \
+ && gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 \
  && gpg --batch --verify /tini.asc /sbin/tini \
  && chmod +x /sbin/tini
 
diff --git a/update.sh b/update.sh
index cb0e3a6..a9a3c09 100755
--- a/update.sh
+++ b/update.sh
@@ -29,7 +29,14 @@ declare -A entrypoints=(
 )
 
 # Only for debian variant
-tini_version="0.18.0"
+tini_version="$(
+	git ls-remote --tags https://github.com/krallin/tini.git \
+		| cut -d/ -f3 \
+		| grep -vE -- '.pre' \
+		| sed -E 's/^v//' \
+		| sort -V \
+		| tail -1
+)"
 
 apcu_version="$(
 	git ls-remote --tags https://github.com/krakjoe/apcu.git \