diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 229658e385..eb2f6b2bb2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -92,7 +92,7 @@ jobs:
           node-version-file: ".nvmrc"
       - name: Start docker containers
         if: ${{ matrix.package == 'datasource-mongo' || matrix.package == 'datasource-mongoose' || matrix.package == 'datasource-sql' || matrix.package == 'datasource-sequelize' || matrix.package == 'datasource-dynamodb' }}
-        run: docker compose -f ./packages/${{ matrix.package }}/docker-compose.yml up -d; sleep 5
+        run: docker compose -f ./packages/${{ matrix.package }}/docker-compose.yml up -d --wait --wait-timeout 180
       - name: Restore dependencies from cache
         uses: actions/cache/restore@v4
         with:
diff --git a/packages/datasource-mongo/docker-compose.yml b/packages/datasource-mongo/docker-compose.yml
index 034bd27103..b7b091b17c 100644
--- a/packages/datasource-mongo/docker-compose.yml
+++ b/packages/datasource-mongo/docker-compose.yml
@@ -25,3 +25,9 @@ services:
       - ./test/ssh-config:/config
     ports:
       - '2224:2222'
+    healthcheck:
+      # sshd only listens once the tunnel mod is downloaded and host keys are generated
+      test: ['CMD', 'ssh-keyscan', '-p', '2222', '127.0.0.1']
+      interval: 2s
+      timeout: 5s
+      retries: 60
diff --git a/packages/datasource-sql/docker-compose.yml b/packages/datasource-sql/docker-compose.yml
index 02a11e1202..b47248ab9e 100644
--- a/packages/datasource-sql/docker-compose.yml
+++ b/packages/datasource-sql/docker-compose.yml
@@ -96,3 +96,9 @@ services:
       - ./test/ssh-config:/config
     ports:
       - '2222:2222'
+    healthcheck:
+      # sshd only listens once the tunnel mod is downloaded and host keys are generated
+      test: ['CMD', 'ssh-keyscan', '-p', '2222', '127.0.0.1']
+      interval: 2s
+      timeout: 5s
+      retries: 60