diff --git a/bitnami/magento/2/debian-12/Dockerfile b/bitnami/magento/2/debian-12/Dockerfile
index d6146f3fa6c5..d25315d83daa 100644
--- a/bitnami/magento/2/debian-12/Dockerfile
+++ b/bitnami/magento/2/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-23T09:11:53Z" \
+      org.opencontainers.image.created="2024-09-02T01:23:17Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/magento/README.md" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="2.4.7-debian-12-r15" \
+      org.opencontainers.image.ref.name="2.4.7-debian-12-r16" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/magento" \
       org.opencontainers.image.title="magento" \
       org.opencontainers.image.vendor="Broadcom, Inc." \
@@ -28,11 +28,11 @@ RUN install_packages acl ca-certificates cron curl libaudit1 libbrotli1 libbsd0
 RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \
     COMPONENTS=( \
       "render-template-1.0.7-3-linux-${OS_ARCH}-debian-12" \
-      "php-8.2.22-3-linux-${OS_ARCH}-debian-12" \
-      "apache-2.4.62-0-linux-${OS_ARCH}-debian-12" \
+      "php-8.2.23-0-linux-${OS_ARCH}-debian-12" \
+      "apache-2.4.62-2-linux-${OS_ARCH}-debian-12" \
       "wait-for-port-1.0.8-3-linux-${OS_ARCH}-debian-12" \
       "mysql-client-10.6.19-0-linux-${OS_ARCH}-debian-12" \
-      "libphp-8.2.22-0-linux-${OS_ARCH}-debian-12" \
+      "libphp-8.2.23-0-linux-${OS_ARCH}-debian-12" \
       "magento-2.4.7-2-linux-${OS_ARCH}-debian-12" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
diff --git a/bitnami/magento/2/debian-12/docker-compose.yml b/bitnami/magento/2/debian-12/docker-compose.yml
index 79cab1c8b974..63f1cd351e6d 100644
--- a/bitnami/magento/2/debian-12/docker-compose.yml
+++ b/bitnami/magento/2/debian-12/docker-compose.yml
@@ -1,7 +1,6 @@
 # Copyright Broadcom, Inc. All Rights Reserved.
 # SPDX-License-Identifier: APACHE-2.0
 
-version: '2'
 services:
   mariadb:
     image: docker.io/bitnami/mariadb:10.6
diff --git a/bitnami/magento/2/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/magento/2/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
index 97a20e9ea6b1..e445769288e6 100644
--- a/bitnami/magento/2/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/magento/2/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,13 +3,13 @@
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "2.4.62-0"
+        "version": "2.4.62-2"
     },
     "libphp": {
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "8.2.22-0"
+        "version": "8.2.23-0"
     },
     "magento": {
         "arch": "amd64",
@@ -27,7 +27,7 @@
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "8.2.22-3"
+        "version": "8.2.23-0"
     },
     "render-template": {
         "arch": "amd64",
diff --git a/bitnami/magento/2/debian-12/rootfs/opt/bitnami/scripts/apache/postunpack.sh b/bitnami/magento/2/debian-12/rootfs/opt/bitnami/scripts/apache/postunpack.sh
index eb8f766a37bf..5e39a42f625f 100755
--- a/bitnami/magento/2/debian-12/rootfs/opt/bitnami/scripts/apache/postunpack.sh
+++ b/bitnami/magento/2/debian-12/rootfs/opt/bitnami/scripts/apache/postunpack.sh
@@ -109,6 +109,7 @@ EOF
 apache_setup_bitnami_config
 
 # Ensure non-root user has write permissions on a set of directories
+chmod g+w "$APACHE_BASE_DIR"
 for dir in "$APACHE_TMP_DIR" "$APACHE_CONF_DIR" "$APACHE_LOGS_DIR" "$APACHE_VHOSTS_DIR" "$APACHE_HTACCESS_DIR" "$APACHE_HTDOCS_DIR" "$APACHE_DEFAULT_CONF_DIR"; do
     ensure_dir_exists "$dir"
     chmod -R g+rwX "$dir"
diff --git a/bitnami/magento/2/debian-12/rootfs/opt/bitnami/scripts/libmysqlclient.sh b/bitnami/magento/2/debian-12/rootfs/opt/bitnami/scripts/libmysqlclient.sh
index b0e0b4c7f73e..c702d828bc84 100644
--- a/bitnami/magento/2/debian-12/rootfs/opt/bitnami/scripts/libmysqlclient.sh
+++ b/bitnami/magento/2/debian-12/rootfs/opt/bitnami/scripts/libmysqlclient.sh
@@ -1029,9 +1029,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=""
diff --git a/bitnami/magento/docker-compose.yml b/bitnami/magento/docker-compose.yml
index 79cab1c8b974..63f1cd351e6d 100644
--- a/bitnami/magento/docker-compose.yml
+++ b/bitnami/magento/docker-compose.yml
@@ -1,7 +1,6 @@
 # Copyright Broadcom, Inc. All Rights Reserved.
 # SPDX-License-Identifier: APACHE-2.0
 
-version: '2'
 services:
   mariadb:
     image: docker.io/bitnami/mariadb:10.6