diff --git a/bitnami/logstash/8/debian-12/Dockerfile b/bitnami/logstash/8/debian-12/Dockerfile
index 4a8a08aa6a565..0206ad7c0bac2 100644
--- a/bitnami/logstash/8/debian-12/Dockerfile
+++ b/bitnami/logstash/8/debian-12/Dockerfile
@@ -10,15 +10,15 @@ 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-11-22T12:36:58Z" \
+      org.opencontainers.image.created="2024-12-12T17:55:46Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/logstash/README.md" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="8.16.1-debian-12-r0" \
+      org.opencontainers.image.ref.name="8.17.0-debian-12-r0" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/logstash" \
       org.opencontainers.image.title="logstash" \
       org.opencontainers.image.vendor="Broadcom, Inc." \
-      org.opencontainers.image.version="8.16.1"
+      org.opencontainers.image.version="8.17.0"
 
 ENV HOME="/" \
     OS_ARCH="${TARGETARCH:-amd64}" \
@@ -31,9 +31,9 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl procps zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \
     COMPONENTS=( \
-      "yq-4.44.5-0-linux-${OS_ARCH}-debian-12" \
+      "yq-4.44.6-0-linux-${OS_ARCH}-debian-12" \
       "java-17.0.13-12-1-linux-${OS_ARCH}-debian-12" \
-      "logstash-8.16.1-0-linux-${OS_ARCH}-debian-12" \
+      "logstash-8.17.0-0-linux-${OS_ARCH}-debian-12" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
@@ -53,7 +53,7 @@ RUN find / -perm /6000 -type f -exec chmod a-s {} \; || true
 COPY rootfs /
 RUN /opt/bitnami/scripts/java/postunpack.sh
 RUN /opt/bitnami/scripts/logstash/postunpack.sh
-ENV APP_VERSION="8.16.1" \
+ENV APP_VERSION="8.17.0" \
     BITNAMI_APP_NAME="logstash" \
     JAVA_HOME="/opt/bitnami/java" \
     PATH="/opt/bitnami/common/bin:/opt/bitnami/java/bin:/opt/bitnami/logstash/bin:$PATH"
diff --git a/bitnami/logstash/8/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/logstash/8/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
index 7d3f079eac9d7..2f4f0e042b339 100644
--- a/bitnami/logstash/8/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/logstash/8/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -9,12 +9,12 @@
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "8.16.1-0"
+        "version": "8.17.0-0"
     },
     "yq": {
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "4.44.5-0"
+        "version": "4.44.6-0"
     }
 }
\ No newline at end of file
diff --git a/bitnami/logstash/8/debian-12/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/logstash/8/debian-12/prebuildfs/opt/bitnami/scripts/libbitnami.sh
index d239f98535735..00d053b5215aa 100644
--- a/bitnami/logstash/8/debian-12/prebuildfs/opt/bitnami/scripts/libbitnami.sh
+++ b/bitnami/logstash/8/debian-12/prebuildfs/opt/bitnami/scripts/libbitnami.sh
@@ -47,8 +47,7 @@ print_image_welcome_page() {
     info ""
     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 "Did you know there are enterprise versions of the Bitnami catalog? For enhanced secure software supply chain features, unlimited pulls from Docker, LTS support, or application customization, see Bitnami Premium or Tanzu Application Catalog. See https://www.arrow.com/globalecs/na/vendors/bitnami/ for more information."
     info ""
 }
 
diff --git a/bitnami/logstash/8/debian-12/rootfs/opt/bitnami/scripts/java/entrypoint.sh b/bitnami/logstash/8/debian-12/rootfs/opt/bitnami/scripts/java/entrypoint.sh
index 8557631d25490..38802fc0bfe91 100755
--- a/bitnami/logstash/8/debian-12/rootfs/opt/bitnami/scripts/java/entrypoint.sh
+++ b/bitnami/logstash/8/debian-12/rootfs/opt/bitnami/scripts/java/entrypoint.sh
@@ -13,6 +13,11 @@ set -o pipefail
 . /opt/bitnami/scripts/libbitnami.sh
 . /opt/bitnami/scripts/liblog.sh
 
+if [[ "$OS_FLAVOUR" =~ photon && "$APP_VERSION" =~ ^1.8 ]]; then
+  # Option --module-path is not supported by JAVA 1.8 since modules were added in version 1.9
+  unset JAVA_TOOL_OPTIONS
+fi
+
 print_welcome_page
 
 echo ""
diff --git a/bitnami/logstash/8/debian-12/tags-info.yaml b/bitnami/logstash/8/debian-12/tags-info.yaml
index 8e0dfd350cf5e..29c22b8e57647 100644
--- a/bitnami/logstash/8/debian-12/tags-info.yaml
+++ b/bitnami/logstash/8/debian-12/tags-info.yaml
@@ -1,5 +1,5 @@
 rolling-tags:
 - "8"
 - 8-debian-12
-- 8.16.1
+- 8.17.0
 - latest