diff --git a/docker/images/main/wait-for-postgres.sh b/docker/images/main/wait-for-postgres.sh
index bff10382..ae7e32c9 100644
--- a/docker/images/main/wait-for-postgres.sh
+++ b/docker/images/main/wait-for-postgres.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-until psql -h "$POSTGRES_HOST" -U "$POSTGRES_USERNAME" -d "$POSTGRES_HOST" -c '\q'; do
+until psql -h "$POSTGRES_HOST" -U "$POSTGRES_USERNAME" -d "$POSTGRES_DATABASE" -c '\q'; do
   >&2 echo "Waiting for Postgres to be ready..."
   sleep 1
 done
diff --git a/docker/images/worker/wait-for-postgres.sh b/docker/images/worker/wait-for-postgres.sh
index bff10382..ae7e32c9 100644
--- a/docker/images/worker/wait-for-postgres.sh
+++ b/docker/images/worker/wait-for-postgres.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-until psql -h "$POSTGRES_HOST" -U "$POSTGRES_USERNAME" -d "$POSTGRES_HOST" -c '\q'; do
+until psql -h "$POSTGRES_HOST" -U "$POSTGRES_USERNAME" -d "$POSTGRES_DATABASE" -c '\q'; do
   >&2 echo "Waiting for Postgres to be ready..."
   sleep 1
 done