diff --git a/overrides/compose.mariadb-secrets.yaml b/overrides/compose.mariadb-secrets.yaml
index af7e47bd..2e904463 100644
--- a/overrides/compose.mariadb-secrets.yaml
+++ b/overrides/compose.mariadb-secrets.yaml
@@ -3,8 +3,6 @@ services:
     environment:
       MYSQL_ROOT_PASSWORD: !reset null
       MYSQL_ROOT_PASSWORD_FILE: /run/secrets/db_password
-    healthcheck:
-      test: mariadb-admin ping -h localhost --password="$(cat /run/secrets/db_password)"
     secrets:
       - db_password
 
diff --git a/overrides/compose.mariadb-shared.yaml b/overrides/compose.mariadb-shared.yaml
index 48c85700..30d148e3 100644
--- a/overrides/compose.mariadb-shared.yaml
+++ b/overrides/compose.mariadb-shared.yaml
@@ -6,9 +6,11 @@ services:
     image: mariadb:11.8
     restart: unless-stopped
     healthcheck:
-      test: mariadb-admin ping -h localhost --password=${DB_PASSWORD:-changeit}
-      interval: 1s
-      retries: 20
+      test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"]
+      start_period: 5s
+      interval: 5s
+      timeout: 5s
+      retries: 5
     command:
       - --character-set-server=utf8mb4
       - --collation-server=utf8mb4_unicode_ci
diff --git a/overrides/compose.mariadb.yaml b/overrides/compose.mariadb.yaml
index d24e2da2..22d95ea5 100644
--- a/overrides/compose.mariadb.yaml
+++ b/overrides/compose.mariadb.yaml
@@ -10,9 +10,11 @@ services:
   db:
     image: mariadb:11.8
     healthcheck:
-      test: mariadb-admin ping -h localhost --password=${DB_PASSWORD:-123}
-      interval: 1s
-      retries: 20
+      test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"]
+      start_period: 5s
+      interval: 5s
+      timeout: 5s
+      retries: 5
     restart: unless-stopped
     command:
       - --character-set-server=utf8mb4