diff --git a/Makefile b/Makefile
index e206c329..5fb6d156 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ DOCKER_PASSWORD=
 DOCKER_REPOSITORY=thecodingmachine
 GOLANGCI_LINT_VERSION=1.19.1
 CODE_COVERAGE=0
-TINI_VERSION=v0.18.0
+TINI_VERSION=0.18.0
 MAXIMUM_WAIT_TIMEOUT=30.0
 MAXIMUM_WAIT_DELAY=10.0
 MAXIMUM_WEBHOOK_URL_TIMEOUT=30.0
diff --git a/build/base/Dockerfile b/build/base/Dockerfile
index dcddb5fb..c40df230 100644
--- a/build/base/Dockerfile
+++ b/build/base/Dockerfile
@@ -9,7 +9,7 @@ FROM debian:buster-slim
 
 RUN echo "deb http://httpredir.debian.org/debian/ buster main contrib non-free" > /etc/apt/sources.list &&\
     apt-get update &&\
-    apt-get install -y curl wget gnupg ttf-mscorefonts-installer
+    apt-get install -y curl wget gnupg ttf-mscorefonts-installer procps
 
 # |--------------------------------------------------------------------------
 # | Chrome
@@ -107,7 +107,4 @@ COPY build/base/fonts.conf /etc/fonts/conf.d/100-gotenberg.conf
 RUN groupadd --gid 1001 gotenberg \
   && useradd --uid 1001 --gid gotenberg --shell /bin/bash --home /gotenberg --no-create-home gotenberg \
   && mkdir /gotenberg \
-  && chown gotenberg: /gotenberg
-
-# TODO remove.
-RUN apt-get install -y procps
\ No newline at end of file
+  && chown gotenberg: /gotenberg
\ No newline at end of file
diff --git a/build/package/Dockerfile b/build/package/Dockerfile
index 723bcf1b..dc36ad1f 100644
--- a/build/package/Dockerfile
+++ b/build/package/Dockerfile
@@ -42,9 +42,9 @@ LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>"
 
 ARG TINI_VERSION
 
-ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
+ADD https://github.com/krallin/tini/releases/download/v${TINI_VERSION}/tini /tini
 RUN chmod +x /tini
-ENTRYPOINT ["/tini", "--"]
+ENTRYPOINT [ "/tini", "--" ]
 
 # |--------------------------------------------------------------------------
 # | Final touch