diff --git a/wait-for-postgres.sh b/wait-for-postgres.sh
index c2b4454..00b0133 100755
--- a/wait-for-postgres.sh
+++ b/wait-for-postgres.sh
@@ -7,7 +7,7 @@ host="$1"
 shift
 cmd="$@"
   
-until PGPASSWORD=$POSTGRES_PASSWORD psql -h "$host" -U "postgres" -c '\q'; do
+until PGUSER=$POSTGRES_USER PGPASSWORD=$POSTGRES_PASSWORD psql -h "$host" -c '\q'; do
   >&2 echo "Postgres is unavailable - sleeping"
   sleep 1
 done