diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 20d488ff94..c8d9aaeb3f 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -2,10 +2,10 @@
 
 set -e
 
-DATABASE_URL=${DATABASE_URL:"postgres://${DB_HOST:-db}:5432/${DB_NAME:-pleroma}"}
+DATABASE_URL=${DATABASE_URL:-"postgres://${DB_USER:-postgres}:${DB_PASS:-postgres}@${DB_HOST:-db}:5432/${DB_NAME:-postgres}"}
 
 echo "-- Waiting for database..."
-while ! pg_isready -U ${DB_USER:-pleroma} -d $DATABASE_URL -t 1; do
+while ! pg_isready -d $DATABASE_URL -t 1; do
     sleep 1s
 done