diff --git a/docker-mailserver/docker-compose.yml b/docker-mailserver/docker-compose.yml
index 538dc3d..812343b 100644
--- a/docker-mailserver/docker-compose.yml
+++ b/docker-mailserver/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3.8"
 
 services:
   mail:
-    image: docker.io/mailserver/docker-mailserver:10.3
+    image: docker.io/mailserver/docker-mailserver:10.4
     hostname: mail
     domainname: zweili.org
     env_file: mailserver.env
diff --git a/docker-mailserver/setup.sh b/docker-mailserver/setup.sh
old mode 100644
new mode 100755
index c8ce619..8dd22b4
--- a/docker-mailserver/setup.sh
+++ b/docker-mailserver/setup.sh
@@ -26,6 +26,7 @@ LBLUE="\e[94m"
 RESET="\e[0m"
 
 set -euEo pipefail
+shopt -s inherit_errexit
 trap '__err "${BASH_SOURCE}" "${FUNCNAME[0]:-?}" "${BASH_COMMAND:-?}" "${LINENO:-?}" "${?:-?}"' ERR
 
 function __err