diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 7ee7768..28cae80 100644
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -1,9 +1,9 @@
 #!/bin/sh
 set -e
 
-# Wait for database to be ready
-echo "Waiting for PostgreSQL to be ready..."
-until pg_isready -h postgres -p 5432 -U postgres; do
+# Wait for database to be ready using psql and DATABASE_URL
+echo "Waiting for PostgreSQL to be ready at $DATABASE_URL..."
+until PGPASSWORD="${PGPASSWORD:-}" psql "$DATABASE_URL" -c '\q' >/dev/null 2>&1; do
   echo "PostgreSQL is unavailable - sleeping"
   sleep 1
 done