diff --git a/api/.env b/api/.env
index 9350d74ce..8a26c9f20 100755
--- a/api/.env
+++ b/api/.env
@@ -13,7 +13,7 @@ TRUSTED_HOSTS=localhost,api
 # Format described at http://docs.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url
 # For an SQLite database, use: "sqlite:///%kernel.project_dir%/var/data.db"
 # Configure your db driver and server_version in config/packages/doctrine.yaml
-DATABASE_URL=pgsql://api-platform:!ChangeMe!@db/api
+DATABASE_URL=postgres://api-platform:!ChangeMe!@db/api
 ###< doctrine/doctrine-bundle ###
 
 ###> nelmio/cors-bundle ###
diff --git a/api/.env.dist b/api/.env.dist
index 9350d74ce..8a26c9f20 100755
--- a/api/.env.dist
+++ b/api/.env.dist
@@ -13,7 +13,7 @@ TRUSTED_HOSTS=localhost,api
 # Format described at http://docs.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url
 # For an SQLite database, use: "sqlite:///%kernel.project_dir%/var/data.db"
 # Configure your db driver and server_version in config/packages/doctrine.yaml
-DATABASE_URL=pgsql://api-platform:!ChangeMe!@db/api
+DATABASE_URL=postgres://api-platform:!ChangeMe!@db/api
 ###< doctrine/doctrine-bundle ###
 
 ###> nelmio/cors-bundle ###
diff --git a/api/docker/php/docker-entrypoint.sh b/api/docker/php/docker-entrypoint.sh
index c9cd18614..d737930fe 100755
--- a/api/docker/php/docker-entrypoint.sh
+++ b/api/docker/php/docker-entrypoint.sh
@@ -14,7 +14,7 @@ if [ "$1" = 'php-fpm' ] || [ "$1" = 'bin/console' ]; then
 	if [ "$APP_ENV" != 'prod' ]; then
 		composer install --prefer-dist --no-progress --no-suggest --no-interaction
 		>&2 echo "Waiting for Postgres to be ready..."
-		until bin/console doctrine:query:sql "SELECT 1" --quiet; do
+		until pg_isready --timeout=0 --dbname="${DATABASE_URL}"; do
 			sleep 1
 		done
 		bin/console doctrine:schema:update --force --no-interaction