diff --git a/containers/zammad/docker-entrypoint.sh b/containers/zammad/docker-entrypoint.sh
index 4b67e0e..f3ea993 100644
--- a/containers/zammad/docker-entrypoint.sh
+++ b/containers/zammad/docker-entrypoint.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 # zammad-railsserver
 if [ "$1" = 'zammad-railsserver' ]; then
   # wait for postgres process coming up on zammad-postgresql