diff --git a/Dockerfile b/Dockerfile
index 4894c3295c2db0e9bbff314240f28fcea3f0eded..d2ca7e56cda3e691e66159598836f1de4087e41f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,6 +25,7 @@ RUN apt-get -y update && \
     eatmydata apt-get -y upgrade && \
     eatmydata apt-get install -y --no-install-recommends \
         build-essential \
+	dumb-init \
 	gettext \
 	libpq5 \
 	libpq-dev \
@@ -54,7 +55,8 @@ VOLUME /var/lib/aleksis
 # Define entrypoint and uWSGI running on port 8000
 EXPOSE 8000
 COPY docker-entrypoint.sh /usr/local/bin/entrypoint.sh
-ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
+ENTRYPOINT ["/usr/bin/dumb-init", "--"]
+CMD ["/usr/local/bin/entrypoint.sh"]
 
 # Install assets
 FROM core as assets