diff --git a/bitnami/mariadb/10.5/debian-12/Dockerfile b/bitnami/mariadb/10.5/debian-12/Dockerfile
index 68aebedc3de6..ca0af6fb0946 100644
--- a/bitnami/mariadb/10.5/debian-12/Dockerfile
+++ b/bitnami/mariadb/10.5/debian-12/Dockerfile
@@ -7,11 +7,11 @@ ARG TARGETARCH
 
 LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \
       org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
-      org.opencontainers.image.created="2024-08-14T10:49:54Z" \
+      org.opencontainers.image.created="2024-09-03T12:21:12Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/mariadb/README.md" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="10.5.26-debian-12-r0" \
+      org.opencontainers.image.ref.name="10.5.26-debian-12-r1" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/mariadb" \
       org.opencontainers.image.title="mariadb" \
       org.opencontainers.image.vendor="Broadcom, Inc." \
diff --git a/bitnami/mariadb/10.5/debian-12/docker-compose-replication.yml b/bitnami/mariadb/10.5/debian-12/docker-compose-replication.yml
index fda454287b8e..0755f15d407a 100644
--- a/bitnami/mariadb/10.5/debian-12/docker-compose-replication.yml
+++ b/bitnami/mariadb/10.5/debian-12/docker-compose-replication.yml
@@ -1,8 +1,6 @@
 # Copyright Broadcom, Inc. All Rights Reserved.
 # SPDX-License-Identifier: APACHE-2.0
 
-version: '2.1'
-
 services:
   mariadb-master:
     image: docker.io/bitnami/mariadb:10.5
diff --git a/bitnami/mariadb/10.5/debian-12/docker-compose.yml b/bitnami/mariadb/10.5/debian-12/docker-compose.yml
index 0a081a9c8bf9..46f9256d79bf 100644
--- a/bitnami/mariadb/10.5/debian-12/docker-compose.yml
+++ b/bitnami/mariadb/10.5/debian-12/docker-compose.yml
@@ -1,8 +1,6 @@
 # Copyright Broadcom, Inc. All Rights Reserved.
 # SPDX-License-Identifier: APACHE-2.0
 
-version: '2.1'
-
 services:
   mariadb:
     image: docker.io/bitnami/mariadb:10.5
diff --git a/bitnami/mariadb/10.5/debian-12/rootfs/opt/bitnami/scripts/libmariadb.sh b/bitnami/mariadb/10.5/debian-12/rootfs/opt/bitnami/scripts/libmariadb.sh
index 3302e9acb103..0ccfe7d1c1c1 100644
--- a/bitnami/mariadb/10.5/debian-12/rootfs/opt/bitnami/scripts/libmariadb.sh
+++ b/bitnami/mariadb/10.5/debian-12/rootfs/opt/bitnami/scripts/libmariadb.sh
@@ -1340,14 +1340,14 @@ find_jemalloc_lib() {
 ########################
 # Execute a reliable health check against the current mysql instance
 # Globals:
-#   DB_ROOT_PASSWORD, DB_MASTER_ROOT_PASSWORD
+#   DB_ROOT_USER, DB_ROOT_PASSWORD, DB_MASTER_ROOT_PASSWORD
 # Arguments:
 #   None
 # Returns:
 #   mysqladmin output
 #########################
 mysql_healthcheck() {
-    local args=("-uroot" "-h0.0.0.0")
+    local args=("-u${DB_ROOT_USER}" "-h0.0.0.0")
     local root_password
 
     root_password="$(get_master_env_var_value ROOT_PASSWORD)"
@@ -1410,9 +1410,7 @@ mysql_client_extra_opts() {
         done
     else
         # Skip SSL validation
-        if [[ "$(mysql_client_flavor)" = "mysql" ]]; then
-            opts+=("--ssl-mode=DISABLED")
-        else
+        if [[ "$(mysql_client_flavor)" = "mariadb" ]]; then
             # SSL connections are enabled by default in MariaDB >=10.11
             local mysql_version=""
             local major_version=""