diff --git a/.docker/docker_run_git.sh b/.docker/docker_run_git.sh
index ba5978ad0eedc..d3f35b5ca527e 100755
--- a/.docker/docker_run_git.sh
+++ b/.docker/docker_run_git.sh
@@ -148,8 +148,7 @@ echo "** Front-office: http://${PS_DOMAIN}/"
 echo "**  Back-office: http://${PS_DOMAIN}/admin-dev"
 echo "**   Login with:"
 echo "**     username: ${ADMIN_MAIL}"
-echo "**     password: Correct Horse Battery Staple"
-echo "**               (if you didn't define your own in ADMIN_PASSWORD environment variable)"
+echo "**     password: ${ADMIN_PASSWD}"
 if [ $PS_USE_DOCKER_MAILDEV -eq 1 ]; then
     echo "**"
     echo "** To view sent emails point your browser to http://localhost:1080/"
diff --git a/docker-compose.yml b/docker-compose.yml
index 8c507d7bdf973..aeb5c3cefc07f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,11 +2,6 @@ version: '2.1'
 
 volumes:
   db-data:
-    name: db-data
-  vendor:
-    name: vendor
-  var:
-    name: var
 
 services:
   mysql:
@@ -16,8 +11,8 @@ services:
     volumes:
       - db-data:/var/lib/mysql
     environment:
-      MYSQL_ROOT_PASSWORD: prestashop
-      MYSQL_DATABASE: prestashop
+      MYSQL_ROOT_PASSWORD: ${DB_PASSWD:-prestashop}
+      MYSQL_DATABASE: ${DB_NAME:-prestashop}
     restart: unless-stopped
 
   keycloak: