diff --git a/containers/zammad-nfs/docker-entrypoint.sh b/containers/zammad-nfs/docker-entrypoint.sh
index b8c1002..b85e1bb 100644
--- a/containers/zammad-nfs/docker-entrypoint.sh
+++ b/containers/zammad-nfs/docker-entrypoint.sh
@@ -1,8 +1,6 @@
 #!/bin/bash
 
-set -o errexit
-set -o nounset
-set -o pipefail
+set -e
 
 if [ "$1" = 'zammad-nfs' ]; then
   echo "create & mount tmpfs"
diff --git a/containers/zammad/docker-entrypoint.sh b/containers/zammad/docker-entrypoint.sh
index d09234b..dd45b2a 100644
--- a/containers/zammad/docker-entrypoint.sh
+++ b/containers/zammad/docker-entrypoint.sh
@@ -1,8 +1,6 @@
 #!/bin/bash
 
-set -o errexit
-set -o nounset
-set -o pipefail
+set -e
 
 function check_railsserver_available {
   # wait for zammad process coming up