diff --git a/core/Dockerfile b/core/Dockerfile
index 6cb6779..046f097 100644
--- a/core/Dockerfile
+++ b/core/Dockerfile
@@ -19,3 +19,5 @@ WORKDIR /opt/mailman
 EXPOSE 8001
 
 ENTRYPOINT ["/opt/run.sh"]
+
+CMD ["/usr/local/bin/master", "-C",  "/config/mailman.cfg"]
diff --git a/core/assets/run.sh b/core/assets/run.sh
index dfc518f..8331159 100755
--- a/core/assets/run.sh
+++ b/core/assets/run.sh
@@ -117,21 +117,4 @@ api_key: $HYPERKITTY_API_KEY
 EOF
 
 
-# SIGTERM Handler so that the container shuts down gracefully.
-function term_handler () {
-	echo "Stopping mailman ..."
-	mailman stop
-	exit 143 # SIGTERM
-}
-
-# Set the trap for SIGTERM.
-trap 'kill ${!}; term_handler' SIGTERM
-
-# Start the mailman server. Mailman will start the master runner and then exit.
-mailman -C /config/mailman.cfg start --force &
-
-# wait forever.
-while true
-do
-  tail -f /dev/null & wait ${!}
-done
+exec "$@"