diff --git a/Dockerfile b/Dockerfile
index 08d7abf..f8b83cc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -73,3 +73,5 @@ HEALTHCHECK --interval=30s --timeout=5s --start-period=30s --start-interval=2s -
 
 EXPOSE     587
 CMD        [ "/bin/sh", "-c", "/scripts/run.sh" ]
+
+ENTRYPOINT ["/tini", "--"]
diff --git a/build-scripts/postfix-install.sh b/build-scripts/postfix-install.sh
index 193568b..7c83f25 100644
--- a/build-scripts/postfix-install.sh
+++ b/build-scripts/postfix-install.sh
@@ -36,7 +36,9 @@ do_alpine() {
 		opendkim-utils \
 		rsyslog \
 		supervisor \
-		tzdata
+		tzdata \
+		tini
+	ln -s /sbin/tini /tini
 }
 
 
@@ -95,9 +97,11 @@ do_ubuntu() {
 		rsyslog \
 		sasl2-bin \
 		supervisor \
-		tzdata
+		tzdata \
+		tini
 	apt-get clean
 	rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+	ln -s /usr/bin/tini /tini
 }
 
 if [ -f /etc/alpine-release ]; then