diff --git a/pica-plume/docker-compose.yml b/pica-plume/docker-compose.yml
index 7ebd94dfead45635a4525d546c6f184d1ec8599f..6a44c051a44aa3dfdd8d665ea9dfb38b6e33ba3d 100644
--- a/pica-plume/docker-compose.yml
+++ b/pica-plume/docker-compose.yml
@@ -28,6 +28,7 @@ services:
       URL: "blog.picasoft.net"
       NAME: "Picablog"
       ADMIN_EMAIL: picasoft@assos.utc.fr
+      DB_HOST: "plumedb"
     volumes:
       - data:/app/static/media
       - searchidx:/app/search_index
diff --git a/pica-plume/entrypoint.sh b/pica-plume/entrypoint.sh
index 6e4523f1ada5472b561b53adeb89f95f92974376..4c06d56fa582c5decc82d01d565bf02f33fba157 100755
--- a/pica-plume/entrypoint.sh
+++ b/pica-plume/entrypoint.sh
@@ -23,7 +23,7 @@ fi
 
 
 # Wait for database to be ready
-while ! PGPASSWORD="${DB_PASSWORD}" psql -h"${DB_HOST}" -U"${DB_USER}" -d"${DB_NAME}" -c "SELECT 1" &>/dev/null; do
+while ! PGPASSWORD="${POSTGRES_PASSWORD}" psql -h"${DB_HOST}" -U"${POSTGRES_USER}" -d"${POSTGRES_DB}" -c "SELECT 1" &>/dev/null; do
   echo "Database server not ready yet, re-trying in 5 seconds..."
   sleep 5
 done