diff --git a/docker/phraseanet/boot.sh b/docker/phraseanet/boot.sh
index e4e17aec7d..120f750684 100755
--- a/docker/phraseanet/boot.sh
+++ b/docker/phraseanet/boot.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -xe
+
 chown -R app:app /var/alchemy/Phraseanet/config
 FILE=/var/alchemy/Phraseanet/config/configuration.yml
 if [ -f "$FILE" ]; then
diff --git a/docker/phraseanet/phraseanet-entrypoint.sh b/docker/phraseanet/phraseanet-entrypoint.sh
index de763cd13a..225b56a672 100755
--- a/docker/phraseanet/phraseanet-entrypoint.sh
+++ b/docker/phraseanet/phraseanet-entrypoint.sh
@@ -5,4 +5,4 @@ set -e
 envsubst < /php.ini.sample > /usr/local/etc/php/php.ini
 envsubst < /php-fpm.conf.sample > /usr/local/etc/php-fpm.conf
 
-docker-php-entrypoint $@
+bash -e docker-php-entrypoint $@