diff --git a/bitnami/dokuwiki/20240206/debian-12/Dockerfile b/bitnami/dokuwiki/20240206/debian-12/Dockerfile
index 02cfa0ce3c75..48657bfbbb41 100644
--- a/bitnami/dokuwiki/20240206/debian-12/Dockerfile
+++ b/bitnami/dokuwiki/20240206/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-07T08:47:30Z" \
+      org.opencontainers.image.created="2024-03-20T10:31:29Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="20240206.1.0-debian-12-r0" \
+      org.opencontainers.image.ref.name="20240206.1.0-debian-12-r1" \
       org.opencontainers.image.title="dokuwiki" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="20240206.1.0"
@@ -27,9 +27,9 @@ RUN install_packages acl ca-certificates curl ldap-utils libbrotli1 libbsd0 libb
 RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \
     COMPONENTS=( \
       "render-template-1.0.6-10-linux-${OS_ARCH}-debian-12" \
-      "php-8.2.16-2-linux-${OS_ARCH}-debian-12" \
-      "apache-2.4.58-7-linux-${OS_ARCH}-debian-12" \
-      "libphp-8.2.16-1-linux-${OS_ARCH}-debian-12" \
+      "php-8.2.17-0-linux-${OS_ARCH}-debian-12" \
+      "apache-2.4.58-8-linux-${OS_ARCH}-debian-12" \
+      "libphp-8.2.17-0-linux-${OS_ARCH}-debian-12" \
       "dokuwiki-20240206.1.0-0-linux-${OS_ARCH}-debian-12" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
diff --git a/bitnami/dokuwiki/20240206/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/dokuwiki/20240206/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
index 36a327a7472a..18e6de019a07 100644
--- a/bitnami/dokuwiki/20240206/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/dokuwiki/20240206/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,7 +3,7 @@
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "2.4.58-7"
+        "version": "2.4.58-8"
     },
     "dokuwiki": {
         "arch": "amd64",
@@ -15,13 +15,13 @@
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "8.2.16-1"
+        "version": "8.2.17-0"
     },
     "php": {
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "8.2.16-2"
+        "version": "8.2.17-0"
     },
     "render-template": {
         "arch": "amd64",
diff --git a/bitnami/dokuwiki/20240206/debian-12/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/dokuwiki/20240206/debian-12/prebuildfs/opt/bitnami/scripts/libbitnami.sh
index 3853c789b2ea..aa782fc6a4db 100644
--- a/bitnami/dokuwiki/20240206/debian-12/prebuildfs/opt/bitnami/scripts/libbitnami.sh
+++ b/bitnami/dokuwiki/20240206/debian-12/prebuildfs/opt/bitnami/scripts/libbitnami.sh
@@ -48,6 +48,7 @@ print_image_welcome_page() {
     info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}"
     info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}"
     info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}"
+    info "Upgrade to Tanzu Application Catalog for production environments to access custom-configured and pre-packaged software components. Gain enhanced features, including Software Bill of Materials (SBOM), CVE scan result reports, and VEX documents. To learn more, visit ${BOLD}https://bitnami.com/enterprise${RESET}"
     info ""
 }
 
diff --git a/bitnami/dokuwiki/20240206/debian-12/rootfs/opt/bitnami/apache/conf/deflate.conf b/bitnami/dokuwiki/20240206/debian-12/rootfs/opt/bitnami/apache/conf/deflate.conf
index ca9bc1d6e4b6..6016f8fbe582 100644
--- a/bitnami/dokuwiki/20240206/debian-12/rootfs/opt/bitnami/apache/conf/deflate.conf
+++ b/bitnami/dokuwiki/20240206/debian-12/rootfs/opt/bitnami/apache/conf/deflate.conf
@@ -1,5 +1,5 @@
 <IfModule mod_deflate.c>
-  AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
+  AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css text/javascript
   AddOutputFilterByType DEFLATE application/x-javascript application/javascript application/ecmascript
   AddOutputFilterByType DEFLATE application/rss+xml
 </IfModule>
diff --git a/bitnami/dokuwiki/20240206/debian-12/rootfs/opt/bitnami/scripts/apache-modphp/postunpack.sh b/bitnami/dokuwiki/20240206/debian-12/rootfs/opt/bitnami/scripts/apache-modphp/postunpack.sh
index a415969338cc..3f0c344de235 100755
--- a/bitnami/dokuwiki/20240206/debian-12/rootfs/opt/bitnami/scripts/apache-modphp/postunpack.sh
+++ b/bitnami/dokuwiki/20240206/debian-12/rootfs/opt/bitnami/scripts/apache-modphp/postunpack.sh
@@ -37,3 +37,7 @@ AddType application/x-httpd-php .php
 DirectoryIndex index.html index.htm index.php
 EOF
 ensure_apache_configuration_exists "Include \"${apache_php_conf_file}\""
+
+# Copy all initially generated configuration files to the default directory
+# (this is to avoid breaking when entrypoint is being overridden)
+cp -r "$APACHE_CONF_DIR"/* "$APACHE_DEFAULT_CONF_DIR"