diff --git a/bin/docker/entrypoint.sh b/bin/docker/entrypoint.sh
index 22e91e2a19..4cb678edc0 100755
--- a/bin/docker/entrypoint.sh
+++ b/bin/docker/entrypoint.sh
@@ -1,20 +1,25 @@
 #!/usr/bin/env bash
 
+# no command line arguments are handled
+
 # Start up OTOBO Daemon and the webserver
 # Run a watchdog over the Daemon via Cron
 
-# no command line arguments are handled
-
-# start the Daemon and set up the Cron watchdog
 # assume that we are in /opt/otobo
-# TODO: this might not work when the database is not yet created and configured
-mkdir var/tmp
+mkdir -p var/tmp
+
+# set up the cronjobs as they are declared in var/cron
 ./bin/Cron.sh start
-perl ./bin/otobo.Daemon.pl start
+
+# Start the Daemon.
+# The Daemon will exit immediately when SecureMode = 0.
+# But this is OK, as Cron will restart it and it will run when SecureMode = 1.
+./bin/otobo.Daemon.pl start
 
 # maintainance jobs
-# TODO: this might not work when the database is not yet created and configured
+# TODO: decide whether it makes sense to run these jobs on startup
 #perl ./bin/otobo.Console.pl Maint::Config::Rebuild
 #perl ./bin/otobo.Console.pl Maint::Cache::Delete
 
+# Start the webserver
 plackup --server Gazelle -R Kernel,bin/psgi-bin/otobo.psgi --port 5000 bin/psgi-bin/otobo.psgi