diff --git a/containers/zammad-postgresql/backup.sh b/containers/zammad-postgresql/backup.sh
index 62e47d4..03a942b 100644
--- a/containers/zammad-postgresql/backup.sh
+++ b/containers/zammad-postgresql/backup.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 if [ "$1" = 'zammad-backup' ]; then
   # wait for zammad process coming up
   until (echo > /dev/tcp/zammad-railsserver/3000) &> /dev/null; do
diff --git a/containers/zammad/docker-entrypoint.sh b/containers/zammad/docker-entrypoint.sh
index f3ea993..9a5d00c 100644
--- a/containers/zammad/docker-entrypoint.sh
+++ b/containers/zammad/docker-entrypoint.sh
@@ -21,15 +21,19 @@ if [ "$1" = 'zammad-railsserver' ]; then
   bundle install
 
   # db mirgrate
+  set +e
   bundle exec rake db:migrate &> /dev/null
 
   if [ $? != 0 ]; then
     echo "creating db & searchindex..."
+    set -e
     bundle exec rake db:create
     bundle exec rake db:migrate
     bundle exec rake db:seed
   fi
 
+  set -e
+
   # es config
   bundle exec rails r "Setting.set('es_url', 'http://zammad-elasticsearch:9200')"
   bundle exec rake searchindex:rebuild