diff --git a/bitnami/wordpress/6/debian-12/Dockerfile b/bitnami/wordpress/6/debian-12/Dockerfile
index 217be966713e..001128649f8c 100644
--- a/bitnami/wordpress/6/debian-12/Dockerfile
+++ b/bitnami/wordpress/6/debian-12/Dockerfile
@@ -7,10 +7,10 @@ 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-03-31T14:44:09Z" \
+      org.opencontainers.image.created="2024-04-01T21:53:56Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="6.4.3-debian-12-r30" \
+      org.opencontainers.image.ref.name="6.4.3-debian-12-r31" \
       org.opencontainers.image.title="wordpress" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="6.4.3"
@@ -29,9 +29,9 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \
       "render-template-1.0.6-10-linux-${OS_ARCH}-debian-12" \
       "php-8.2.17-1-linux-${OS_ARCH}-debian-12" \
       "apache-2.4.58-8-linux-${OS_ARCH}-debian-12" \
-      "mysql-client-11.2.3-1-linux-${OS_ARCH}-debian-12" \
+      "mysql-client-11.2.3-2-linux-${OS_ARCH}-debian-12" \
       "libphp-8.2.17-0-linux-${OS_ARCH}-debian-12" \
-      "wordpress-6.4.3-20-linux-${OS_ARCH}-debian-12" \
+      "wordpress-6.4.3-21-linux-${OS_ARCH}-debian-12" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
diff --git a/bitnami/wordpress/6/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/wordpress/6/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
index 0b98a0ad724a..0ed59ecd07a0 100644
--- a/bitnami/wordpress/6/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/wordpress/6/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -15,7 +15,7 @@
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "11.2.3-1"
+        "version": "11.2.3-2"
     },
     "php": {
         "arch": "amd64",
@@ -33,6 +33,6 @@
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "6.4.3-20"
+        "version": "6.4.3-21"
     }
 }
\ No newline at end of file
diff --git a/bitnami/wordpress/6/debian-12/rootfs/opt/bitnami/scripts/wordpress/postunpack.sh b/bitnami/wordpress/6/debian-12/rootfs/opt/bitnami/scripts/wordpress/postunpack.sh
index 73a60494e56b..86f1681249e8 100755
--- a/bitnami/wordpress/6/debian-12/rootfs/opt/bitnami/scripts/wordpress/postunpack.sh
+++ b/bitnami/wordpress/6/debian-12/rootfs/opt/bitnami/scripts/wordpress/postunpack.sh
@@ -86,3 +86,7 @@ path: "${BITNAMI_ROOT_DIR}/wordpress"
 EOF
 render-template "${BITNAMI_ROOT_DIR}/scripts/wordpress/bitnami-templates/wp.tpl" >"${WP_CLI_BIN_DIR}/wp"
 configure_permissions_ownership "${WP_CLI_BIN_DIR}/wp" -f "755"
+
+# Copy all initially generated configuration files to the default directory
+# (this is to avoid breaking when entrypoint is being overridden)
+cp -r "/opt/bitnami/$(web_server_type)/conf"/* "/opt/bitnami/$(web_server_type)/conf.default"