diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile
index 67a2140ede..9fd690290c 100644
--- a/packaging/docker/Dockerfile
+++ b/packaging/docker/Dockerfile
@@ -27,7 +27,7 @@ RUN apt-get update && \
 		lsof>=4.89+dfsg-0.1 \
 		tcptraceroute>=1.5beta7+debian-4build1 \
 		telnet>=0.17-41 \
-		netcat>= 1.10-41.1 \
+		netcat>=1.10-41.1 \
 		strace>=4.21-1ubuntu1 \
 		tcpdump>=4.9.3-0ubuntu0.18.04.1 \
 		less>=487-0.1 \
@@ -84,3 +84,13 @@ ENV FDB_COORDINATOR ""
 ENV FDB_COORDINATOR_PORT 4500
 ENV FDB_CLUSTER_FILE_CONTENTS ""
 ENV FDB_PROCESS_CLASS unset
+
+# Adding tini as PID 1 https://github.com/krallin/tini
+ARG TINI_VERSION=v0.19.0
+RUN curl -sLO https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-amd64 && \
+    curl -sLO https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-amd64.sha256sum && \
+	sha256sum -c tini-amd64.sha256sum && \
+	rm -f tini-amd64.sha256sum && \
+    chmod +x tini-amd64 && \
+	mv tini-amd64 /usr/bin/tini
+ENTRYPOINT ["/usr/bin/tini", "-g", "--"]