diff --git a/Dockerfile b/Dockerfile
index 7ea740b..b5001d1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,3 @@
-MAINTAINER Zammad <info@zammad.org>
 ARG BUILD_DATE
 
 LABEL org.label-schema.build-date="$BUILD_DATE" \
diff --git a/containers/zammad-elasticsearch/Dockerfile b/containers/zammad-elasticsearch/Dockerfile
index 04c578d..99f5e06 100644
--- a/containers/zammad-elasticsearch/Dockerfile
+++ b/containers/zammad-elasticsearch/Dockerfile
@@ -12,4 +12,6 @@ LABEL org.label-schema.build-date="$BUILD_DATE" \
       org.label-schema.schema-version="3.2.0" \
       org.label-schema.docker.cmd="sysctl -w vm.max_map_count=262144;docker-compose up"
 
+SHELL ["/bin/bash", "-e", "-o", "pipefail", "-c"]
+
 RUN yes | /usr/share/elasticsearch/bin/elasticsearch-plugin install ingest-attachment
diff --git a/containers/zammad-postgresql/Dockerfile b/containers/zammad-postgresql/Dockerfile
index b5ae3be..bacf81c 100644
--- a/containers/zammad-postgresql/Dockerfile
+++ b/containers/zammad-postgresql/Dockerfile
@@ -13,6 +13,8 @@ LABEL org.label-schema.build-date="$BUILD_DATE" \
       org.label-schema.schema-version="3.2.0" \
       org.label-schema.docker.cmd="sysctl -w vm.max_map_count=262144;docker-compose up"
 
+SHELL ["/bin/bash", "-e", "-o", "pipefail", "-c"]
+
 # copy backup script
 COPY containers/zammad-postgresql/backup.sh /usr/local/bin/
 RUN chmod +x /usr/local/bin/backup.sh
diff --git a/containers/zammad/Dockerfile b/containers/zammad/Dockerfile
index 9c4c371..8fb92f5 100644
--- a/containers/zammad/Dockerfile
+++ b/containers/zammad/Dockerfile
@@ -16,6 +16,8 @@ ENV ZAMMAD_READY_FILE ${ZAMMAD_DIR}/tmp/zammad.ready
 ENV ZAMMAD_TMP_DIR /tmp/zammad-${GIT_BRANCH}
 ENV ZAMMAD_USER zammad
 
+SHELL ["/bin/bash", "-e", "-o", "pipefail", "-c"]
+
 # install zammad
 COPY containers/zammad/setup.sh /tmp
 RUN chmod +x /tmp/setup.sh; \
@@ -24,7 +26,6 @@ RUN chmod +x /tmp/setup.sh; \
 
 FROM ruby:2.5.5-slim
 
-MAINTAINER Zammad <info@zammad.org>
 ARG BUILD_DATE
 ARG DEBIAN_FRONTEND=noninteractive