diff --git a/devops/docker/autoconfig/entrypoint.sh b/devops/docker/autoconfig/entrypoint.sh
index 16a30377f02fd61b10750fc96121600719aa045d..c2734b0e17e8969eea12e0b609c4ae6efa5a040d 100755
--- a/devops/docker/autoconfig/entrypoint.sh
+++ b/devops/docker/autoconfig/entrypoint.sh
@@ -17,8 +17,8 @@
 # @author  Sebastian Kehr <kehr@ub.uni-leipzig.de>
 # @license https://opensource.org/licenses/GPL-3.0 GNU GPLv3
 
-until ! ping -c1 env >/dev/null 2>&1; do :; done
-set -a; [ -f ./data/docker/env/autoconfig ] && . ./data/docker/env/autoconfig; set +a
+until ! (ping -c1 env >/dev/null 2>&1) && [ -f ./data/docker/env/autoconfig ]; do :; done
+set -a; . ./data/docker/env/autoconfig; set +a
 
 if [ "$(whoami)" = "node" ]; then
   [ -d "$HOME" ] || PREFIX=$HOME npm install -g @ubleipzig/autoconfig@2.3.2
diff --git a/devops/docker/composer/entrypoint.sh b/devops/docker/composer/entrypoint.sh
index 7d7261c6dda9088a4b080d35ecdbb688421c0395..dd445c103f4ca45f63c32451309a7ddbf9bb7762 100755
--- a/devops/docker/composer/entrypoint.sh
+++ b/devops/docker/composer/entrypoint.sh
@@ -23,8 +23,8 @@ if [ "$(whoami)" = "php" ]; then
   exit
 fi
 
-until ! ping -c1 env >/dev/null 2>&1; do :; done
-set -a; [ -f ./data/docker/env/composer ] && . ./data/docker/env/composer; set +a
+until ! (ping -c1 env >/dev/null 2>&1) && [ -f ./data/docker/env/composer ]; do :; done
+set -a; . ./data/docker/env/composer; set +a
 
 : "${UIDGID:=$(stat -c '%u' .):$(stat -c '%g' .)}"
 echo "php:x:$UIDGID:php::/bin/sh" >> /etc/passwd
diff --git a/devops/docker/db/entrypoint.sh b/devops/docker/db/entrypoint.sh
index 8d4496520ab0e57c786020b179f402fa151a0b67..168bb590f52fe4830dbfef5134481a9fe9c68e25 100755
--- a/devops/docker/db/entrypoint.sh
+++ b/devops/docker/db/entrypoint.sh
@@ -17,7 +17,7 @@
 # @author  Sebastian Kehr <kehr@ub.uni-leipzig.de>
 # @license https://opensource.org/licenses/GPL-3.0 GNU GPLv3
 
-until ! ping -c1 env >/dev/null 2>&1; do :; done
-set -a; [ -f ./data/docker/env/db ] && . ./data/docker/env/db; set +a
+until ! (ping -c1 env >/dev/null 2>&1) && [ -f ./data/docker/env/db ]; do :; done
+set -a; . ./data/docker/env/db; set +a
 
 exec docker-entrypoint.sh "$@"
\ No newline at end of file
diff --git a/devops/docker/grunt/entrypoint.sh b/devops/docker/grunt/entrypoint.sh
index ba4fc1f8a05038afa15805ac76bf4162771d9b29..06189b8b841d115fc1926a84b992f248d2c82538 100755
--- a/devops/docker/grunt/entrypoint.sh
+++ b/devops/docker/grunt/entrypoint.sh
@@ -35,8 +35,8 @@ if [ "$(whoami)" = "node" ]; then
   exit
 fi
 
-until ! ping -c1 env >/dev/null 2>&1; do :; done
-set -a; [ -f ./data/docker/env/grunt ] && . ./data/docker/env/grunt; set +a
+until ! (ping -c1 env >/dev/null 2>&1) && [ -f ./data/docker/env/grunt ]; do :; done
+set -a; . ./data/docker/env/grunt; set +a
 
 trap term_grunt TERM
 : "${UIDGID:=$(stat -c '%u' .):$(stat -c '%g' .)}"
diff --git a/devops/docker/mail/entrypoint.sh b/devops/docker/mail/entrypoint.sh
index caf4219c3fe8bf667063aa3a03cb272d66118b63..c2fb39bfc2e70857a3eb641e224e476294a8878e 100755
--- a/devops/docker/mail/entrypoint.sh
+++ b/devops/docker/mail/entrypoint.sh
@@ -17,8 +17,8 @@
 # @author  Sebastian Kehr <kehr@ub.uni-leipzig.de>
 # @license https://opensource.org/licenses/GPL-3.0 GNU GPLv3
 
-until ! ping -c1 env >/dev/null 2>&1; do :; done
-set -a; [ -f ./data/docker/env/mail ] && . ./data/docker/env/mail; set +a
+until ! (ping -c1 env >/dev/null 2>&1) && [ -f ./data/docker/env/mail ]; do :; done
+set -a; . ./data/docker/env/mail; set +a
 
 trap 'supervisorctl stop dovecot && supervisorctl stop postfix && exit 0' TERM
 /docker/init "$@" &
diff --git a/devops/docker/php/entrypoint.sh b/devops/docker/php/entrypoint.sh
index 17f535933d41213cee73c1494df68f25c2077735..927b845f7d11d2f22a194b0751fbeb40957722d7 100755
--- a/devops/docker/php/entrypoint.sh
+++ b/devops/docker/php/entrypoint.sh
@@ -17,8 +17,8 @@
 # @author  Sebastian Kehr <kehr@ub.uni-leipzig.de>
 # @license https://opensource.org/licenses/GPL-3.0 GNU GPLv3
 
-until ! ping -c1 env >/dev/null 2>&1; do :; done
-set -a; [ -f ./data/docker/env/php ] && . ./data/docker/env/php; set +a
+until ! (ping -c1 env >/dev/null 2>&1) && [ -f ./data/docker/env/php ]; do :; done
+set -a; . ./data/docker/env/php; set +a
 
 : "${UIDGID:=$(stat -c '%u' .):$(stat -c '%g' .)}"
 sed -i "s/$(id -u www-data):$(id -g www-data)/$UIDGID/" /etc/passwd