diff --git a/bitnami/elasticsearch/8/debian-11/Dockerfile b/bitnami/elasticsearch/8/debian-11/Dockerfile
index 262b983cc818..8c4de368924a 100644
--- a/bitnami/elasticsearch/8/debian-11/Dockerfile
+++ b/bitnami/elasticsearch/8/debian-11/Dockerfile
@@ -6,11 +6,11 @@ ARG TARGETARCH
 
 LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
       org.opencontainers.image.description="Application packaged by Bitnami" \
-      org.opencontainers.image.ref.name="8.5.3-debian-11-r10" \
+      org.opencontainers.image.ref.name="8.6.0-debian-11-r0" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/elasticsearch" \
       org.opencontainers.image.title="elasticsearch" \
       org.opencontainers.image.vendor="VMware, Inc." \
-      org.opencontainers.image.version="8.5.3"
+      org.opencontainers.image.version="8.6.0"
 
 ENV HOME="/" \
     OS_ARCH="${TARGETARCH:-amd64}" \
@@ -27,7 +27,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
       "yq-4.30.6-0-linux-${OS_ARCH}-debian-11" \
       "java-17.0.5-8-2-linux-${OS_ARCH}-debian-11" \
       "gosu-1.16.0-0-linux-${OS_ARCH}-debian-11" \
-      "elasticsearch-8.5.3-0-linux-${OS_ARCH}-debian-11" \
+      "elasticsearch-8.6.0-0-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
@@ -45,7 +45,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.5.3" \
+ENV APP_VERSION="8.6.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 65fd079c319b..3cc450b43591 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
@@ -1,10 +1,10 @@
 {
     "elasticsearch": {
         "arch": "amd64",
-        "digest": "64d2d62afeb3519e38619d71f047070d541da79167eac4a9773fa43f64110d57",
+        "digest": "b7654d0883928dde9039f4b3f3bbd3dbbfbcf2f37c48313dbf16d77988aa9b56",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "8.5.3-0"
+        "version": "8.6.0-0"
     },
     "gosu": {
         "arch": "amd64",
diff --git a/bitnami/elasticsearch/8/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh b/bitnami/elasticsearch/8/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh
index f3bc7568bfa5..ad2f0eee48df 100644
--- a/bitnami/elasticsearch/8/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh
+++ b/bitnami/elasticsearch/8/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh
@@ -31,7 +31,7 @@ get_sematic_version () {
 
         while [[ $i -lt $n ]]; do
             if [[ -n "${BASH_REMATCH[$i]}" ]] && [[ "${BASH_REMATCH[$i]:0:1}" != '.' ]];  then
-                version_sections[$j]=${BASH_REMATCH[$i]}
+                version_sections[j]="${BASH_REMATCH[$i]}"
                 ((j++))
             fi
             ((i++))
diff --git a/bitnami/elasticsearch/8/debian-11/rootfs/opt/bitnami/scripts/elasticsearch-env.sh b/bitnami/elasticsearch/8/debian-11/rootfs/opt/bitnami/scripts/elasticsearch-env.sh
index 103aebbfc9b7..68f0acee0bae 100644
--- a/bitnami/elasticsearch/8/debian-11/rootfs/opt/bitnami/scripts/elasticsearch-env.sh
+++ b/bitnami/elasticsearch/8/debian-11/rootfs/opt/bitnami/scripts/elasticsearch-env.sh
@@ -27,7 +27,6 @@ elasticsearch_env_vars=(
     ELASTICSEARCH_BIND_ADDRESS
     ELASTICSEARCH_ADVERTISED_HOSTNAME
     ELASTICSEARCH_CLUSTER_HOSTS
-    ELASTICSEARCH_TOTAL_NODES
     ELASTICSEARCH_CLUSTER_MASTER_HOSTS
     ELASTICSEARCH_CLUSTER_NAME
     ELASTICSEARCH_HEAP_SIZE
@@ -120,7 +119,6 @@ export ELASTICSEARCH_DAEMON_GROUP="elasticsearch"
 export ELASTICSEARCH_BIND_ADDRESS="${ELASTICSEARCH_BIND_ADDRESS:-}"
 export ELASTICSEARCH_ADVERTISED_HOSTNAME="${ELASTICSEARCH_ADVERTISED_HOSTNAME:-}"
 export ELASTICSEARCH_CLUSTER_HOSTS="${ELASTICSEARCH_CLUSTER_HOSTS:-}"
-export ELASTICSEARCH_TOTAL_NODES="${ELASTICSEARCH_TOTAL_NODES:-}"
 export ELASTICSEARCH_CLUSTER_MASTER_HOSTS="${ELASTICSEARCH_CLUSTER_MASTER_HOSTS:-}"
 export ELASTICSEARCH_CLUSTER_NAME="${ELASTICSEARCH_CLUSTER_NAME:-}"
 export ELASTICSEARCH_HEAP_SIZE="${ELASTICSEARCH_HEAP_SIZE:-1024m}"
diff --git a/bitnami/elasticsearch/8/debian-11/rootfs/opt/bitnami/scripts/libelasticsearch.sh b/bitnami/elasticsearch/8/debian-11/rootfs/opt/bitnami/scripts/libelasticsearch.sh
index e6c2468ed53d..e8c79b0a2bd2 100644
--- a/bitnami/elasticsearch/8/debian-11/rootfs/opt/bitnami/scripts/libelasticsearch.sh
+++ b/bitnami/elasticsearch/8/debian-11/rootfs/opt/bitnami/scripts/libelasticsearch.sh
@@ -388,13 +388,9 @@ elasticsearch_cluster_configuration() {
     if [[ -n "$ELASTICSEARCH_CLUSTER_HOSTS" ]]; then
         read -r -a host_list <<<"$(tr ',;' ' ' <<<"$ELASTICSEARCH_CLUSTER_HOSTS")"
         master_list=("${host_list[@]}")
-        total_nodes=${#host_list[@]}
         if [[ -n "$ELASTICSEARCH_CLUSTER_MASTER_HOSTS" ]]; then
             read -r -a master_list <<<"$(tr ',;' ' ' <<<"$ELASTICSEARCH_CLUSTER_MASTER_HOSTS")"
         fi
-        if [[ -n "$ELASTICSEARCH_TOTAL_NODES" ]]; then
-            total_nodes=$ELASTICSEARCH_TOTAL_NODES
-        fi
         es_version="$(elasticsearch_get_version)"
         es_major_version="$(get_sematic_version "$es_version" 1)"
         elasticsearch_conf_set discovery.seed_hosts "${host_list[@]}"
diff --git a/bitnami/elasticsearch/8/debian-11/tags-info.yaml b/bitnami/elasticsearch/8/debian-11/tags-info.yaml
index a2de04bbe165..c86bc444f0d9 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.5.3"
+  - "8.6.0"
   - "latest"
diff --git a/bitnami/elasticsearch/README.md b/bitnami/elasticsearch/README.md
index 94a452158c6b..831a83ed1b1f 100644
--- a/bitnami/elasticsearch/README.md
+++ b/bitnami/elasticsearch/README.md
@@ -238,7 +238,6 @@ For larger cluster, you can setup 'dedicated nodes' using the following environm
 * `ELASTICSEARCH_IS_DEDICATED_NODE`: Elasticsearch node to behave as a 'dedicated node'. Default: **no**
 * `ELASTICSEARCH_NODE_TYPE`: Elasticsearch node type when behaving as a 'dedicated node'. Valid values: *master*, *data*, *coordinating* or *ingest*.
 * `ELASTICSEARCH_CLUSTER_MASTER_HOSTS`: List of elasticsearch master-eligible hosts. Available separators are ' ', ',' and ';'. If no values are provided, it will have the same value as `ELASTICSEARCH_CLUSTER_HOSTS`.
-* `ELASTICSEARCH_TOTAL_NODES`: Number of master + data nodes, it's used to calculate `gateway.expected_nodes` and `gateway.recover_after_nodes` parameters. If not set, those parameters are calculated using `ELASTICSEARCH_CLUSTER_HOSTS`. No defaults.
 
 Find more information about 'dedicated nodes' in the [official documentation](https://www.elastic.co/guide/en/elasticsearch/reference/current/modules-node.html).