diff --git a/bitnami/apache/2.4/debian-12/Dockerfile b/bitnami/apache/2.4/debian-12/Dockerfile
index e953ac125dac..105911b15255 100644
--- a/bitnami/apache/2.4/debian-12/Dockerfile
+++ b/bitnami/apache/2.4/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-08T13:56:41Z" \
+      org.opencontainers.image.created="2024-03-31T15:42:26Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="2.4.58-debian-12-r20" \
+      org.opencontainers.image.ref.name="2.4.58-debian-12-r21" \
       org.opencontainers.image.title="apache" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="2.4.58"
diff --git a/bitnami/apache/2.4/debian-12/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/apache/2.4/debian-12/prebuildfs/opt/bitnami/scripts/libbitnami.sh
index 3853c789b2ea..aa782fc6a4db 100644
--- a/bitnami/apache/2.4/debian-12/prebuildfs/opt/bitnami/scripts/libbitnami.sh
+++ b/bitnami/apache/2.4/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/apache/2.4/debian-12/rootfs/opt/bitnami/apache/conf/deflate.conf b/bitnami/apache/2.4/debian-12/rootfs/opt/bitnami/apache/conf/deflate.conf
index ca9bc1d6e4b6..6016f8fbe582 100644
--- a/bitnami/apache/2.4/debian-12/rootfs/opt/bitnami/apache/conf/deflate.conf
+++ b/bitnami/apache/2.4/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/apache/README.md b/bitnami/apache/README.md
index 6f8b5e4efc35..e40b47a8460b 100644
--- a/bitnami/apache/README.md
+++ b/bitnami/apache/README.md
@@ -121,9 +121,11 @@ Access your web server in the browser by navigating to `http://localhost:8080/`.
 
 #### Customizable environment variables
 
-| Name                   | Description                    | Default Value |
-|------------------------|--------------------------------|---------------|
-| `APACHE_SERVER_TOKENS` | Apache ServerTokens directive. | `Prod`        |
+| Name                       | Description                       | Default Value |
+|----------------------------|-----------------------------------|---------------|
+| `APACHE_HTTP_PORT_NUMBER`  | HTTP port number used by Apache.  | `nil`         |
+| `APACHE_HTTPS_PORT_NUMBER` | HTTPS port number used by Apache. | `nil`         |
+| `APACHE_SERVER_TOKENS`     | Apache ServerTokens directive.    | `Prod`        |
 
 #### Read-only environment variables
 
@@ -144,9 +146,7 @@ Access your web server in the browser by navigating to `http://localhost:8080/`.
 | `APACHE_DAEMON_USER`               | Apache system user.                                       | `daemon`                          |
 | `APACHE_DAEMON_GROUP`              | Apache system group.                                      | `daemon`                          |
 | `APACHE_DEFAULT_HTTP_PORT_NUMBER`  | Default Apache HTTP port number to enable at build time.  | `8080`                            |
-| `APACHE_DEFAULT_HTTP_PORT_NUMBER`  | Default Apache HTTP port number to enable at build time.  | `80`                              |
 | `APACHE_DEFAULT_HTTPS_PORT_NUMBER` | Default Apache HTTPS port number to enable at build time. | `8443`                            |
-| `APACHE_DEFAULT_HTTPS_PORT_NUMBER` | Default Apache HTTPS port number to enable at build time. | `443`                             |
 
 When you start the Apache image, you can adjust the configuration of the instance by passing one or more environment variables either on the docker-compose file or on the `docker run` command line. If you want to add a new environment variable: