diff --git a/bitnami/elasticsearch/8/debian-11/Dockerfile b/bitnami/elasticsearch/8/debian-11/Dockerfile
index 48e52b9f2750..f834cb6a167b 100644
--- a/bitnami/elasticsearch/8/debian-11/Dockerfile
+++ b/bitnami/elasticsearch/8/debian-11/Dockerfile
@@ -5,13 +5,13 @@ ARG JAVA_EXTRA_SECURITY_DIR="/bitnami/java/extra-security"
 ARG TARGETARCH
 
 LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2023-03-27T23:28:23Z" \
+      org.opencontainers.image.created="2023-04-01T12:44:53Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="8.6.2-debian-11-r13" \
+      org.opencontainers.image.ref.name="8.7.0-debian-11-r0" \
       org.opencontainers.image.title="elasticsearch" \
       org.opencontainers.image.vendor="VMware, Inc." \
-      org.opencontainers.image.version="8.6.2"
+      org.opencontainers.image.version="8.7.0"
 
 ENV HOME="/" \
     OS_ARCH="${TARGETARCH:-amd64}" \
@@ -25,10 +25,10 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl libasound2-dev libc6 libfreetype6 libfreetype6-dev libgcc1 procps zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
-      "yq-4.33.1-0-linux-${OS_ARCH}-debian-11" \
-      "java-17.0.6-10-3-linux-${OS_ARCH}-debian-11" \
-      "gosu-1.16.0-3-linux-${OS_ARCH}-debian-11" \
-      "elasticsearch-8.6.2-2-linux-${OS_ARCH}-debian-11" \
+      "yq-4.33.2-0-linux-${OS_ARCH}-debian-11" \
+      "java-17.0.6-10-4-linux-${OS_ARCH}-debian-11" \
+      "gosu-1.16.0-5-linux-${OS_ARCH}-debian-11" \
+      "elasticsearch-8.7.0-0-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
@@ -46,7 +46,7 @@ RUN chmod g+rwX /opt/bitnami
 COPY rootfs /
 RUN /opt/bitnami/scripts/elasticsearch/postunpack.sh
 RUN /opt/bitnami/scripts/java/postunpack.sh
-ENV APP_VERSION="8.6.2" \
+ENV APP_VERSION="8.7.0" \
     BITNAMI_APP_NAME="elasticsearch" \
     ES_JAVA_HOME="/opt/bitnami/java" \
     JAVA_HOME="/opt/bitnami/java" \
diff --git a/bitnami/elasticsearch/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/elasticsearch/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 532f6c646c1f..2349d2d75ac1 100644
--- a/bitnami/elasticsearch/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/elasticsearch/8/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,24 +3,24 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "8.6.2-2"
+        "version": "8.7.0-0"
     },
     "gosu": {
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "1.16.0-3"
+        "version": "1.16.0-5"
     },
     "java": {
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "17.0.6-10-3"
+        "version": "17.0.6-10-4"
     },
     "yq": {
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "4.33.1-0"
+        "version": "4.33.2-0"
     }
 }
\ No newline at end of file
diff --git a/bitnami/elasticsearch/8/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/elasticsearch/8/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh
index 6fcb304d34cc..d70cf0779ec8 100644
--- a/bitnami/elasticsearch/8/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh
+++ b/bitnami/elasticsearch/8/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh
@@ -279,7 +279,7 @@ remove_logrotate_conf() {
 # Flags:
 #   --custom-service-content - Custom content to add to the [service] block
 #   --environment - Environment variable to define (multiple --environment options may be passed)
-#   --environment-file - Text file with environment variables
+#   --environment-file - Text file with environment variables (multiple --environment-file options may be passed)
 #   --exec-start - Start command (required)
 #   --exec-start-pre - Pre-start command (optional)
 #   --exec-start-post - Post-start command (optional)
@@ -330,7 +330,6 @@ generate_systemd_conf() {
             | --type \
             | --user \
             | --group \
-            | --environment-file \
             | --exec-start \
             | --exec-stop \
             | --exec-reload \
@@ -368,6 +367,12 @@ generate_systemd_conf() {
                 [[ -n "$environment" ]] && environment+=$'\n'
                 environment+="Environment=${1:?"--environment value is missing"}"
                 ;;
+            --environment-file)
+                shift
+                # It is possible to add multiple environment-file lines
+                [[ -n "$environment_file" ]] && environment_file+=$'\n'
+                environment_file+="EnvironmentFile=${1:?"--environment-file value is missing"}"
+                ;;
             *)
                 echo "Invalid command line flag ${1}" >&2
                 return 1
@@ -435,7 +440,8 @@ EOF
         cat >> "$service_file" <<< "$environment"
     fi
     if [[ -n "$environment_file" ]]; then
-        cat >> "$service_file" <<< "EnvironmentFile=${environment_file}"
+        # This variable may contain multiple EnvironmentFile= directives
+        cat >> "$service_file" <<< "$environment_file"
     fi
     # Logging
     if [[ -n "$standard_output" ]]; then
diff --git a/bitnami/elasticsearch/8/debian-11/tags-info.yaml b/bitnami/elasticsearch/8/debian-11/tags-info.yaml
index 5d7695f9ae93..195b22d5faf5 100644
--- a/bitnami/elasticsearch/8/debian-11/tags-info.yaml
+++ b/bitnami/elasticsearch/8/debian-11/tags-info.yaml
@@ -1,5 +1,5 @@
 rolling-tags:
 - "8"
 - 8-debian-11
-- 8.6.2
+- 8.7.0
 - latest