diff --git a/docker-compose.yml b/docker-compose.yml
index 2968c83..0d3c0c7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,6 +2,8 @@
 secrets:
   gitea_runner_token:
     file: secrets/gitea_runner_token.txt
+  mariadb_root_password:
+    file: secrets/mariadb_root_password
 
 configs:
   caddyfile:
@@ -498,18 +500,29 @@ services:
 
   mariadb:
     container_name: mariadb
-    image: linuxserver/mariadb
+    image: linuxserver/mariadb:11.4.5
     networks:
       public:
         ipv4_address: 192.168.240.23
     ports:
       - "${MARIADB_EXTERNAL_PORT}:${MARIADB_INTERNAL_PORT}"
+    secrets:
+      - mariadb_root_password
     environment:
       - MARIADB_AUTO_UPGRADE=true
+      - PUID=${PUID}
+      - PGID=${PGID}
+      - TZ=${TZ}
+      - FILE__MYSQL_ROOT_PASSWORD=/run/secrets/mariadb_root_password
     volumes:
       - "${DOCKER_STORAGE_PATH}/mariadb:/config"
       - sockets:/run/mysqld/
     restart: unless-stopped
+    healthcheck:
+      test: [ "CMD", "mariadb-admin", "ping", "-h", "localhost" ]
+      interval: 5s
+      timeout: 5s
+      retries: 10
 
   baserow:
     container_name: baserow
diff --git a/secrets/mariadb_root_password b/secrets/mariadb_root_password
new file mode 100644
index 0000000..c52769d
Binary files /dev/null and b/secrets/mariadb_root_password differ