diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index 838e32e64c..1471f077d1 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -13,10 +13,6 @@ services:
     - ../:/var/alchemy
     - .:/var/alchemy/Phraseanet
     - ./docker/nginx/root/entrypoint.sh:/entrypoint.sh
-    - ${PHRASEANET_DATA_DIR}:/var/alchemy/Phraseanet/datas:rw
-    - ${PHRASEANET_THUMBNAILS_DIR}:/var/alchemy/Phraseanet/www/thumbnails:rw
-    - ${PHRASEANET_TMP_DIR}:/var/alchemy/Phraseanet/tmp:rw
-    - ${PHRASEANET_CUSTOM_DIR}:/var/alchemy/Phraseanet/www/custom:rw
 
   builder:
     build:
@@ -50,25 +46,12 @@ services:
     volumes:
     - ../:/var/alchemy
     - .:/var/alchemy/Phraseanet
-    - ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw
-    - ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw
-    - ${PHRASEANET_DATA_DIR}:/var/alchemy/Phraseanet/datas:rw
-    - ${PHRASEANET_THUMBNAILS_DIR}:/var/alchemy/Phraseanet/www/thumbnails:rw
-    - ${PHRASEANET_CUSTOM_DIR}:/var/alchemy/Phraseanet/www/custom:rw
-    - ${PHRASEANET_CACHE_DIR}:/var/alchemy/Phraseanet/cache:rw
-    - ${PHRASEANET_TMP_DIR}:/var/alchemy/Phraseanet/tmp:rw
 
   worker:
     volumes:
     - ../:/var/alchemy
     - .:/var/alchemy/Phraseanet
-    - ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw
-    - ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw
-    - ${PHRASEANET_DATA_DIR}:/var/alchemy/Phraseanet/datas:rw
-    - ${PHRASEANET_THUMBNAILS_DIR}:/var/alchemy/Phraseanet/www/thumbnails:rw
-    - ${PHRASEANET_CUSTOM_DIR}:/var/alchemy/Phraseanet/www/custom:rw
-    - ${PHRASEANET_CACHE_DIR}:/var/alchemy/Phraseanet/cache:rw
-    - ${PHRASEANET_TMP_DIR}:/var/alchemy/Phraseanet/tmp:rw
+
 
   rabbitmq:
     ports:
diff --git a/docker-compose.yml b/docker-compose.yml
index d8d716cb4e..6a16aa136a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -64,13 +64,13 @@ services:
     - PHRASEANET_SMTP_USER
     - PHRASEANET_SMTP_PASSWORD
     volumes:
-    - config_vol:/var/alchemy/Phraseanet/config:rw
-    - data_vol:/var/alchemy/Phraseanet/datas:rw
-    - tmp_vol:/var/alchemy/Phraseanet/tmp:rw
-    - logs_vol:/var/alchemy/Phraseanet/logs:rw
-    - thumbnails_vol:/var/alchemy/Phraseanet/www/thumbnails:rw
-    - custom_vol:/var/alchemy/Phraseanet/www/custom:rw
-    - cache_vol:/var/alchemy/Phraseanet/cache:rw
+    - ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw
+    - ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw
+    - ${PHRASEANET_DATA_DIR}:/var/alchemy/Phraseanet/datas:rw
+    - ${PHRASEANET_THUMBNAILS_DIR}:/var/alchemy/Phraseanet/www/thumbnails:rw
+    - ${PHRASEANET_CUSTOM_DIR}:/var/alchemy/Phraseanet/www/custom:rw
+    - ${PHRASEANET_CACHE_DIR}:/var/alchemy/Phraseanet/cache:rw
+    - ${PHRASEANET_TMP_DIR}:/var/alchemy/Phraseanet/tmp:rw
 
   worker:
     build:
@@ -94,13 +94,13 @@ services:
     - SESSION_CACHE_LIMITER
     - PHP_LOG_LEVEL
     volumes:
-    - config_vol:/var/alchemy/Phraseanet/config:rw
-    - data_vol:/var/alchemy/Phraseanet/datas:rw
-    - tmp_vol:/var/alchemy/Phraseanet/tmp:rw
-    - logs_vol:/var/alchemy/Phraseanet/logs:rw
-    - thumbnails_vol:/var/alchemy/Phraseanet/www/thumbnails:rw
-    - custom_vol:/var/alchemy/Phraseanet/www/custom:rw
-    - cache_vol:/var/alchemy/Phraseanet/cache:rw
+    - ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw
+    - ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw
+    - ${PHRASEANET_DATA_DIR}:/var/alchemy/Phraseanet/datas:rw
+    - ${PHRASEANET_THUMBNAILS_DIR}:/var/alchemy/Phraseanet/www/thumbnails:rw
+    - ${PHRASEANET_CUSTOM_DIR}:/var/alchemy/Phraseanet/www/custom:rw
+    - ${PHRASEANET_CACHE_DIR}:/var/alchemy/Phraseanet/cache:rw
+    - ${PHRASEANET_TMP_DIR}:/var/alchemy/Phraseanet/tmp:rw
 
   db:
     image: $PHRASEANET_DOCKER_REGISTRY/phraseanet-db:$PHRASEANET_DOCKER_TAG
diff --git a/docker/phraseanet/entrypoint.sh b/docker/phraseanet/entrypoint.sh
index 9d22cef4ff..e4b4451062 100755
--- a/docker/phraseanet/entrypoint.sh
+++ b/docker/phraseanet/entrypoint.sh
@@ -24,8 +24,8 @@ if [ -f "$FILE" ]; then
         bin/setup system:config set registry.email.smtp-enabled $PHRASEANET_SMTP_ENABLED
         bin/setup system:config set registry.email.smtp-auth-enabled $PHRASEANET_SMTP_AUTH_ENABLED
         bin/setup system:config set registry.email.smtp-auth-secure-mode $PHRASEANET_SMTP_SECURE_MODE
-        bin/setup system:config set registry.email.smtp-auth-host $PHRASEANET_SMTP_HOST
-        bin/setup system:config set registry.email.smtp-auth-port $PHRASEANET_SMTP_PORT
+        bin/setup system:config set registry.email.smtp-host $PHRASEANET_SMTP_HOST
+        bin/setup system:config set registry.email.smtp-port $PHRASEANET_SMTP_PORT
         bin/setup system:config set registry.email.smtp-user $PHRASEANET_SMTP_USER
         bin/setup system:config set registry.email.smtp-password $PHRASEANET_SMTP_PASSWORD
         bin/setup system:config set registry.email.emitter-email $PHRASEANET_EMITTER_EMAIL