diff --git a/devcontainer-example/docker-compose.yml b/devcontainer-example/docker-compose.yml
index 0a614cbf..0d6d9d8a 100644
--- a/devcontainer-example/docker-compose.yml
+++ b/devcontainer-example/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3.7"
 services:
   mariadb:
-    image: docker.io/mariadb:10.6
+    image: docker.io/mariadb:11.8
     command:
       - --character-set-server=utf8mb4
       - --collation-server=utf8mb4_unicode_ci
@@ -9,6 +9,7 @@ services:
       - --skip-innodb-read-only-compressed # Temporary fix for MariaDB 10.6
     environment:
       MYSQL_ROOT_PASSWORD: 123
+      MARIADB_AUTO_UPGRADE: 1
     volumes:
       - mariadb-data:/var/lib/mysql
 
diff --git a/overrides/compose.mariadb-secrets.yaml b/overrides/compose.mariadb-secrets.yaml
index a8172431..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: mysqladmin 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 8872b48f..30d148e3 100644
--- a/overrides/compose.mariadb-shared.yaml
+++ b/overrides/compose.mariadb-shared.yaml
@@ -3,12 +3,14 @@ version: "3.3"
 services:
   database:
     container_name: mariadb-database
-    image: mariadb:10.6
+    image: mariadb:11.8
     restart: unless-stopped
     healthcheck:
-      test: mysqladmin 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
@@ -16,6 +18,7 @@ services:
       - --skip-innodb-read-only-compressed
     environment:
       MYSQL_ROOT_PASSWORD: ${DB_PASSWORD:-changeit}
+      MARIADB_AUTO_UPGRADE: 1
     volumes:
       - db-data:/var/lib/mysql
     networks:
diff --git a/overrides/compose.mariadb.yaml b/overrides/compose.mariadb.yaml
index ebce5038..22d95ea5 100644
--- a/overrides/compose.mariadb.yaml
+++ b/overrides/compose.mariadb.yaml
@@ -8,11 +8,13 @@ services:
         condition: service_healthy
 
   db:
-    image: mariadb:10.6
+    image: mariadb:11.8
     healthcheck:
-      test: mysqladmin 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
@@ -21,6 +23,7 @@ services:
       - --skip-innodb-read-only-compressed # Temporary fix for MariaDB 10.6
     environment:
       MYSQL_ROOT_PASSWORD: ${DB_PASSWORD:-123}
+      MARIADB_AUTO_UPGRADE: 1
     volumes:
       - db-data:/var/lib/mysql