diff --git a/docker-compose.yml b/docker-compose.yml
index 8aeb17d..b229a08 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -15,6 +15,8 @@ services:
       retries: 3
       start_period: 30s
     environment:
+      # Run "composer require symfony/orm-pack" to install and configure Doctrine ORM
+      DATABASE_URL: postgresql://${POSTGRES_USER:-symfony}:${POSTGRES_PASSWORD:-ChangeMe}@db:5432/${POSTGRES_DB:-app}?serverVersion=${POSTGRES_VERSION:-13}
       SYMFONY_VERSION:
 
   caddy:
diff --git a/docker/php/docker-entrypoint.sh b/docker/php/docker-entrypoint.sh
index 4333f15..682ad3e 100755
--- a/docker/php/docker-entrypoint.sh
+++ b/docker/php/docker-entrypoint.sh
@@ -29,6 +29,27 @@ if [ "$1" = 'php-fpm' ] || [ "$1" = 'php' ] || [ "$1" = 'bin/console' ]; then
       composer install --prefer-dist --no-progress --no-suggest --no-interaction
   fi
 
+  if grep -q DATABASE_URL= .env; then
+    echo "Waiting for db to be ready..."
+    ATTEMPTS_LEFT_TO_REACH_DATABASE=60
+    until [ $ATTEMPTS_LEFT_TO_REACH_DATABASE -eq 0 ] || bin/console doctrine:query:sql "SELECT 1" > /dev/null 2>&1; do
+      sleep 1
+      ATTEMPTS_LEFT_TO_REACH_DATABASE=$((ATTEMPTS_LEFT_TO_REACH_DATABASE-1))
+      echo "Still waiting for db to be ready... Or maybe the db is not reachable. $ATTEMPTS_LEFT_TO_REACH_DATABASE attempts left"
+    done
+
+    if [ $ATTEMPTS_LEFT_TO_REACH_DATABASE -eq 0 ]; then
+      echo "The db is not up or not reachable"
+      exit 1
+    else
+       echo "The db is now ready and reachable"
+    fi
+
+    if ls -A migrations/*.php > /dev/null 2>&1; then
+      bin/console doctrine:migrations:migrate --no-interaction
+    fi
+  fi
+
 	setfacl -R -m u:www-data:rwX -m u:"$(whoami)":rwX var
 	setfacl -dR -m u:www-data:rwX -m u:"$(whoami)":rwX var
 fi