diff --git a/.github/workflows/build-docker-mariadb.yml b/.github/workflows/build-docker-mariadb.yml
index dc5cf4c64..641007c79 100644
--- a/.github/workflows/build-docker-mariadb.yml
+++ b/.github/workflows/build-docker-mariadb.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Start the stack
         run: docker-compose up -d
       - name: Wait for stack to come up
-        run: sleep 120
+        run: sleep 300
       - name: Check health
         run: curl -f -k --retry 10 --retry-connrefused --connect-timeout 30 --retry-delay 30 https://localhost:8443/fineract-provider/actuator/health
       - name: Check info
diff --git a/.github/workflows/build-mariadb.yml b/.github/workflows/build-mariadb.yml
index b85e0d3ad..bb74ea49b 100644
--- a/.github/workflows/build-mariadb.yml
+++ b/.github/workflows/build-mariadb.yml
@@ -15,7 +15,7 @@ jobs:
                 - 3306:3306
             env:
                 MARIADB_ROOT_PASSWORD: mysql
-            options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
+            options: --health-cmd="healthcheck.sh --su-mysql --connect --innodb_initialized" --health-interval=5s --health-timeout=2s --health-retries=3
 
         mock-oauth2-server:
           image: ghcr.io/navikt/mock-oauth2-server:0.5.9
diff --git a/docker-compose.yml b/docker-compose.yml
index a2ee368a1..dd2e3fe66 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -29,7 +29,7 @@ services:
     environment:
       MYSQL_ROOT_PASSWORD: skdcnwauicn2ucnaecasdsajdnizucawencascdca
     healthcheck:
-      test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost", "--password=skdcnwauicn2ucnaecasdsajdnizucawencascdca" ]
+      test: ["CMD", "healthcheck.sh", "--su-mysql", "--connect", "--innodb_initialized"]
       timeout: 10s
       retries: 10
     ports: