diff --git a/bitnami/mariadb-galera/10.5/debian-12/Dockerfile b/bitnami/mariadb-galera/10.5/debian-12/Dockerfile
index 3ab1304991de..aa4d12f072e2 100644
--- a/bitnami/mariadb-galera/10.5/debian-12/Dockerfile
+++ b/bitnami/mariadb-galera/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-07-25T04:52:34Z" \
+      org.opencontainers.image.created="2024-08-05T11:26:01Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/mariadb-galera/README.md" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="10.5.25-debian-12-r13" \
+      org.opencontainers.image.ref.name="10.5.25-debian-12-r14" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/mariadb-galera" \
       org.opencontainers.image.title="mariadb-galera" \
       org.opencontainers.image.vendor="Broadcom, Inc." \
@@ -29,7 +29,7 @@ RUN install_packages ca-certificates curl iproute2 ldap-utils libaio1 libaudit1
 RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \
     COMPONENTS=( \
       "ini-file-1.4.7-2-linux-${OS_ARCH}-debian-12" \
-      "mariadb-galera-10.5.25-8-linux-${OS_ARCH}-debian-12" \
+      "mariadb-galera-10.5.25-9-linux-${OS_ARCH}-debian-12" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
diff --git a/bitnami/mariadb-galera/10.5/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/mariadb-galera/10.5/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
index dd34cd397f7b..ac764e75c36f 100644
--- a/bitnami/mariadb-galera/10.5/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/mariadb-galera/10.5/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -9,6 +9,6 @@
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "10.5.25-8"
+        "version": "10.5.25-9"
     }
 }
\ No newline at end of file
diff --git a/bitnami/mariadb-galera/10.5/debian-12/rootfs/opt/bitnami/scripts/libmariadbgalera.sh b/bitnami/mariadb-galera/10.5/debian-12/rootfs/opt/bitnami/scripts/libmariadbgalera.sh
index 9248ac059ef7..d954f749f24e 100644
--- a/bitnami/mariadb-galera/10.5/debian-12/rootfs/opt/bitnami/scripts/libmariadbgalera.sh
+++ b/bitnami/mariadb-galera/10.5/debian-12/rootfs/opt/bitnami/scripts/libmariadbgalera.sh
@@ -533,96 +533,6 @@ mariadb_upgrade() {
     debug_execute "${DB_BIN_DIR}/mysql_upgrade" "${args[@]}" || echo "This installation is already upgraded"
 }
 
-########################
-# Ensure a db user exists with the given password for the '%' host
-# Globals:
-#   DB_*
-# Flags:
-#   -p|--password - database password
-#   -u|--user - database user
-#   --auth-plugin - authentication plugin
-#   --use-ldap - authenticate user via LDAP
-#   --host - database host
-#   --port - database host
-# Arguments:
-#   $1 - database user
-# Returns:
-#   None
-#########################
-mariadb_ensure_user_exists() {
-    local -r user="${1:?user is required}"
-    local password=""
-    local auth_plugin=""
-    local use_ldap="no"
-    local hosts
-    local auth_string=""
-    # For accessing an external database
-    local db_host=""
-    local db_port=""
-
-    # Validate arguments
-    shift 1
-    while [ "$#" -gt 0 ]; do
-        case "$1" in
-            -p|--password)
-                shift
-                password="${1:?missing database password}"
-                ;;
-            --auth-plugin)
-                shift
-                auth_plugin="${1:?missing authentication plugin}"
-                ;;
-            --use-ldap)
-                use_ldap="yes"
-                ;;
-            --host)
-                shift
-                db_host="${1:?missing database host}"
-                ;;
-            --port)
-                shift
-                db_port="${1:?missing database port}"
-                ;;
-            *)
-                echo "Invalid command line flag $1" >&2
-                return 1
-                ;;
-        esac
-        shift
-    done
-    if is_boolean_yes "$use_ldap"; then
-        auth_string="identified via pam using '$DB_FLAVOR'"
-    elif [[ -n "$password" ]]; then
-        if [[ -n "$auth_plugin" ]]; then
-            auth_string="identified with $auth_plugin by '$password'"
-        else
-            auth_string="identified by '$password'"
-        fi
-    fi
-    debug "creating database user \'$user\'"
-
-    local -a mysql_execute_cmd=("mysql_execute")
-    local -a mysql_execute_print_output_cmd=("mysql_execute_print_output")
-    if [[ -n "$db_host" && -n "$db_port" ]]; then
-        mysql_execute_cmd=("mysql_remote_execute" "$db_host" "$db_port")
-        mysql_execute_print_output_cmd=("mysql_remote_execute_print_output" "$db_host" "$db_port")
-    fi
-
-    "${mysql_execute_cmd[@]}" "mysql" "$DB_ROOT_USER" "$DB_ROOT_PASSWORD" <<EOF
-create or replace user '${user}'@'%' ${auth_string};
-EOF
-    debug "Removing all other hosts for the user"
-    hosts=$("${mysql_execute_print_output_cmd[@]}" "mysql" "$DB_ROOT_USER" "$DB_ROOT_PASSWORD" <<EOF
-select Host from user where User='${user}' and Host!='%';
-EOF
-)
-    for host in $hosts; do
-        "${mysql_execute_cmd[@]}" "mysql" "$DB_ROOT_USER" "$DB_ROOT_PASSWORD" <<EOF
-drop user '$user'@'$host';
-EOF
-    done
-}
-
 #!/bin/bash
 # Copyright Broadcom, Inc. All Rights Reserved.
 # SPDX-License-Identifier: APACHE-2.0
@@ -1732,6 +1642,98 @@ mysql_migrate_old_configuration() {
     fi
 }
 
+########################
+# Ensure a db user exists with the given password for the '%' host
+# Globals:
+#   DB_*
+# Flags:
+#   -p|--password - database password
+#   -u|--user - database user
+#   --auth-plugin - authentication plugin
+#   --use-ldap - authenticate user via LDAP
+#   --host - database host
+#   --port - database host
+# Arguments:
+#   $1 - database user
+# Returns:
+#   None
+#########################
+mysql_ensure_user_exists() {
+    local -r user="${1:?user is required}"
+    local password=""
+    local auth_plugin=""
+    local use_ldap="no"
+    local hosts
+    local auth_string=""
+    # For accessing an external database
+    local db_host=""
+    local db_port=""
+
+    # Validate arguments
+    shift 1
+    while [ "$#" -gt 0 ]; do
+        case "$1" in
+            -p|--password)
+                shift
+                password="${1:?missing database password}"
+                ;;
+            --auth-plugin)
+                shift
+                auth_plugin="${1:?missing authentication plugin}"
+                ;;
+            --use-ldap)
+                use_ldap="yes"
+                ;;
+            --host)
+                shift
+                db_host="${1:?missing database host}"
+                ;;
+            --port)
+                shift
+                db_port="${1:?missing database port}"
+                ;;
+            *)
+                echo "Invalid command line flag $1" >&2
+                return 1
+                ;;
+        esac
+        shift
+    done
+    if is_boolean_yes "$use_ldap"; then
+        auth_string="identified via pam using '$DB_FLAVOR'"
+    elif [[ -n "$password" ]]; then
+        if [[ -n "$auth_plugin" ]]; then
+            auth_string="identified with $auth_plugin by '$password'"
+        else
+            auth_string="identified by '$password'"
+        fi
+    fi
+    debug "creating database user \'$user\'"
+
+    local -a mysql_execute_cmd=("mysql_execute")
+    local -a mysql_execute_print_output_cmd=("mysql_execute_print_output")
+    if [[ -n "$db_host" && -n "$db_port" ]]; then
+        mysql_execute_cmd=("mysql_remote_execute" "$db_host" "$db_port")
+        mysql_execute_print_output_cmd=("mysql_remote_execute_print_output" "$db_host" "$db_port")
+    fi
+
+    local mysql_create_user_cmd
+    [[ "$DB_FLAVOR" = "mariadb" ]] && mysql_create_user_cmd="create or replace user" || mysql_create_user_cmd="create user if not exists"
+    "${mysql_execute_cmd[@]}" "mysql" "$DB_ROOT_USER" "$DB_ROOT_PASSWORD" <<EOF
+${mysql_create_user_cmd} '${user}'@'%' ${auth_string};
+EOF
+    debug "Removing all other hosts for the user"
+    hosts=$("${mysql_execute_print_output_cmd[@]}" "mysql" "$DB_ROOT_USER" "$DB_ROOT_PASSWORD" <<EOF
+select Host from user where User='${user}' and Host!='%';
+EOF
+)
+    for host in $hosts; do
+        "${mysql_execute_cmd[@]}" "mysql" "$DB_ROOT_USER" "$DB_ROOT_PASSWORD" <<EOF
+drop user '$user'@'$host';
+EOF
+    done
+}
+
 ########################
 # Ensure a db user does not exist
 # Globals:
@@ -1969,7 +1971,7 @@ mysql_ensure_optional_user_exists() {
         flags+=("-p" "$password")
         [[ -n "$auth_plugin" ]] && flags=("${flags[@]}" "--auth-plugin" "$auth_plugin")
     fi
-    "${DB_FLAVOR}"_ensure_user_exists "${flags[@]}"
+    mysql_ensure_user_exists "${flags[@]}"
 }
 
 ########################
@@ -2200,6 +2202,22 @@ mysql_client_extra_opts() {
             value="$(mysql_client_env_value "SSL_${key^^}_FILE")"
             [[ -n "${value}" ]] && opts+=("--ssl-${key}=${value}")
         done
+    else
+        # Skip SSL validation
+        if [[ "$(mysql_client_flavor)" = "mysql" ]]; then
+            opts+=("--ssl-mode=DISABLED")
+        else
+            # SSL connections are enabled by default in MariaDB >=10.11
+            local mysql_version=""
+            local major_version=""
+            local minor_version=""
+            mysql_version="$(mysql_get_version)"
+            major_version="$(get_sematic_version "${mysql_version}" 1)"
+            minor_version="$(get_sematic_version "${mysql_version}" 2)"
+            if [[ "${major_version}" -gt 10 ]] || [[ "${major_version}" -eq 10 && "${minor_version}" -eq 11 ]]; then
+                opts+=("--skip-ssl")
+            fi
+        fi
     fi
     echo "${opts[@]:-}"
 }