diff --git a/tools/docker-compose/compose.yaml b/tools/docker-compose/compose.yaml
index db6107e17..446433e44 100644
--- a/tools/docker-compose/compose.yaml
+++ b/tools/docker-compose/compose.yaml
@@ -6,10 +6,8 @@ services:
       context: $PWD
       dockerfile: wisdom-service.Containerfile
     depends_on:
-      redis:
-        condition: service_started
-      db:
-        condition: service_healthy
+      - redis
+      - db
     restart: always
     volumes:
       - $PWD/ansible_wisdom:/var/www/ansible_wisdom
@@ -43,8 +41,6 @@ services:
       - POSTGRES_DB=wisdom
       - POSTGRES_USER=wisdom
     restart: always
-    healthcheck:
-      test: pg_isready -U wisdom
     networks:
       - dbnet
 # Disabled because this doesn't work properly on MacOS.
diff --git a/tools/scripts/launch-wisdom.sh b/tools/scripts/launch-wisdom.sh
index 34830544d..7e6239929 100755
--- a/tools/scripts/launch-wisdom.sh
+++ b/tools/scripts/launch-wisdom.sh
@@ -1,4 +1,24 @@
 #!/bin/bash
+set -o errexit
+
+database_ready() {
+/var/www/venv/bin/python ansible_wisdom/manage.py shell <<EOF
+import sys
+from django.db import connection
+
+try:
+    connection.ensure_connection()
+except Exception:
+    sys.exit(1)
+EOF
+}
+
+until database_ready
+do
+    echo "Waiting until the database is ready..."
+    sleep 5
+done
+
 /var/www/venv/bin/python ansible_wisdom/manage.py migrate --noinput
 
 cd ansible_wisdom/