diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index d1bab0a6233..237e6834d6c 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -538,15 +538,17 @@ jobs:
           LICENSE: "accept"
           DBNAME: "doctrine"
 
-        options: "--privileged=true"
+        options: >-
+          --health-cmd "/database/config/db2inst1/sqllib/bin/db2 -t \"CONNECT TO ${DBNAME};\" >nul && /database/config/db2inst1/sqllib/bin/db2 -t \"SELECT 1 FROM sysibm.sysdummy1;\" >nul;"
+          --health-interval 20s
+          --health-timeout 10s
+          --health-retries 10
+          --privileged
 
         ports:
           - "50000:50000"
 
     steps:
-      - name: "Perform healthcheck from the outside"
-        run: "docker logs -f ${{ job.services.ibm_db2.id }} | sed '/(*) Setup has completed./ q'"
-
       - name: "Create temporary tablespace"
         run: "docker exec ${{ job.services.ibm_db2.id }} su - db2inst1 -c 'db2 -t CONNECT TO doctrine; db2 -t CREATE USER TEMPORARY TABLESPACE doctrine_tbsp PAGESIZE 4 K;'"