diff --git a/docker-compose.yaml b/docker-compose.yaml
index f047e1d7f85e558cad823d6feb7e6713b9f6545e..337818ab8d855aa8017f0dbdb543b00cc8a8e152 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -7,7 +7,6 @@ services:
       - postgres_data:/var/lib/postgresql/data/
     environment:
       - POSTGRES_USER=biscuit
-      - POSTGRES_PASSWORD=biscuit
       - POSTGRES_DB=biscuit
   memcached:
     image: memcached:latest
@@ -21,7 +20,6 @@ services:
       - BISCUIT_secret_key=DoNotUseInProduction
       - BISCUIT_http__allowed_hosts="['*']"
       - BISCUIT_database__host=db
-      - BISCUIT_database__password=biscuit
       - BISCUIT_caching__memcached__address=memcached:11211
     depends_on:
       - db
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 0d80fd6f0b3871d4cc25fc9c810067418bc32298..a5039fdcdf3a7e431eaa0c408ea4c2b7fabf044c 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -1,8 +1,12 @@
 #!/bin/bash
 
 GUNICORN_BIND=${GUNICORN_BIND:-0.0.0.0:8000}
+POSTGRES_HOST=${BISCUIT_database__host:-127.0.0.1}
+POSTGRES_PORT=${BISCUIT_database__port:-5432}
 
-while ! nc -z ${BISCUIT_database__host} 5432; do
+[[ -n $POSTGRES_PASSWORD ]] && BISCUIT_database__password=$POSTGRES_PASSWORD
+
+while ! nc -z $POSTGRES_HOST $POSTGRES_PORT; do
     sleep 0.1
 done