diff --git a/bitnami/mysql/8.0/debian-12/Dockerfile b/bitnami/mysql/8.0/debian-12/Dockerfile
index 4f06b2304f30..19d8ba55c73a 100644
--- a/bitnami/mysql/8.0/debian-12/Dockerfile
+++ b/bitnami/mysql/8.0/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-24T08:49:47Z" \
+      org.opencontainers.image.created="2024-09-03T12:16:35Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/mysql/README.md" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="8.0.39-debian-12-r3" \
+      org.opencontainers.image.ref.name="8.0.39-debian-12-r4" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/mysql" \
       org.opencontainers.image.title="mysql" \
       org.opencontainers.image.vendor="Broadcom, Inc." \
diff --git a/bitnami/mysql/8.0/debian-12/docker-compose-replication.yml b/bitnami/mysql/8.0/debian-12/docker-compose-replication.yml
index 3dda285752f5..07c31e8919aa 100644
--- a/bitnami/mysql/8.0/debian-12/docker-compose-replication.yml
+++ b/bitnami/mysql/8.0/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:
   mysql-master:
     image: docker.io/bitnami/mysql:8.0
diff --git a/bitnami/mysql/8.0/debian-12/docker-compose.yml b/bitnami/mysql/8.0/debian-12/docker-compose.yml
index 074a25720a0d..cc880b40087a 100644
--- a/bitnami/mysql/8.0/debian-12/docker-compose.yml
+++ b/bitnami/mysql/8.0/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:
   mysql:
     image: docker.io/bitnami/mysql:8.0
diff --git a/bitnami/mysql/8.0/debian-12/rootfs/opt/bitnami/scripts/libmysql.sh b/bitnami/mysql/8.0/debian-12/rootfs/opt/bitnami/scripts/libmysql.sh
index e25f74fa5385..197749817ba1 100644
--- a/bitnami/mysql/8.0/debian-12/rootfs/opt/bitnami/scripts/libmysql.sh
+++ b/bitnami/mysql/8.0/debian-12/rootfs/opt/bitnami/scripts/libmysql.sh
@@ -1404,9 +1404,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=""