diff --git a/bitnami/elasticsearch/8/debian-10/Dockerfile b/bitnami/elasticsearch/8/debian-10/Dockerfile
index e0dee802fcdf..780f1322e10e 100644
--- a/bitnami/elasticsearch/8/debian-10/Dockerfile
+++ b/bitnami/elasticsearch/8/debian-10/Dockerfile
@@ -26,7 +26,7 @@ RUN /opt/bitnami/scripts/elasticsearch/postunpack.sh
 RUN /opt/bitnami/scripts/java/postunpack.sh
 ENV APP_VERSION="8.1.2" \
     BITNAMI_APP_NAME="elasticsearch" \
-    BITNAMI_IMAGE_VERSION="8.1.2-debian-10-r0" \
+    BITNAMI_IMAGE_VERSION="8.1.2-debian-10-r1" \
     ES_JAVA_HOME="/opt/bitnami/java" \
     JAVA_HOME="/opt/bitnami/java" \
     LD_LIBRARY_PATH="/opt/bitnami/elasticsearch/jdk/lib:/opt/bitnami/elasticsearch/jdk/lib/server:$LD_LIBRARY_PATH"
diff --git a/bitnami/elasticsearch/8/debian-10/rootfs/opt/bitnami/scripts/libelasticsearch.sh b/bitnami/elasticsearch/8/debian-10/rootfs/opt/bitnami/scripts/libelasticsearch.sh
index 64f7c9224fa8..e5a5c2d43a91 100644
--- a/bitnami/elasticsearch/8/debian-10/rootfs/opt/bitnami/scripts/libelasticsearch.sh
+++ b/bitnami/elasticsearch/8/debian-10/rootfs/opt/bitnami/scripts/libelasticsearch.sh
@@ -268,14 +268,8 @@ elasticsearch_validate() {
         if [[ -n "$ELASTICSEARCH_NODE_TYPE" ]] && [[ "$es_major_version" -ge 8 ]] ; then
             print_validation_error "Setting ELASTICSEARCH_NODE_TYPE is not available when using Elasticsearch 8, use ELASTICSEARCH_NODE_ROLES instead."
         fi
-        # Node roles introduced in Elasticsearch 7
-        if [[ -n "$ELASTICSEARCH_NODE_ROLES" ]] && [[ "$es_major_version" -lt 7 ]] ; then
-            print_validation_error "Setting ELASTICSEARCH_NODE_ROLES is not available when using Elasticsearch 6, use ELASTICSEARCH_NODE_TYPE instead."
-        fi
 
-        if [[ "$es_major_version" -le 6 ]]; then
-            validate_node_type
-        elif [[ "$es_major_version" -ge 8 ]]; then
+        if [[ "$es_major_version" -ge 8 ]]; then
             validate_node_roles
         elif [[ "$es_major_version" -eq 7 ]]; then
             if [[ -n "$ELASTICSEARCH_NODE_TYPE" ]]; then
@@ -389,27 +383,9 @@ elasticsearch_cluster_configuration() {
         fi
         es_version="$(elasticsearch_get_version)"
         es_major_version="$(get_sematic_version "$es_version" 1)"
-        if [[ "$es_major_version" -le 6 ]]; then
-            # discovery.zen.minimum_master_nodes deprecated and ignored in Elasticsearch 7, removed in Elasticsearch 8
-            if [[ -n "$ELASTICSEARCH_MINIMUM_MASTER_NODES" ]]; then
-                debug "Setting minimum master nodes for quorum to $ELASTICSEARCH_MINIMUM_MASTER_NODES..."
-                elasticsearch_conf_set discovery.zen.minimum_master_nodes "$ELASTICSEARCH_MINIMUM_MASTER_NODES"
-            elif [[ "${#host_list[@]}" -gt 2 ]]; then
-                local min_masters=""
-                min_masters=$(((${#host_list[@]} / 2) + 1))
-                debug "Calculating minimum master nodes for quorum: $min_masters..."
-                elasticsearch_conf_set discovery.zen.minimum_master_nodes "$min_masters"
-            fi
-            # Replaced by discovery.seed_hosts in Elasticsearch 7, removed in Elasticsearch 8
-            elasticsearch_conf_set discovery.zen.ping.unicast.hosts "${host_list[@]}"
-            # Below settings were removed in Elasticsearch 7.8
-            elasticsearch_conf_set gateway.recover_after_nodes "$(((total_nodes + 1 + 1) / 2))"
-            elasticsearch_conf_set gateway.expected_nodes "$total_nodes"
-        else
-            elasticsearch_conf_set discovery.seed_hosts "${host_list[@]}"
-            if is_node_type_master; then
-                elasticsearch_conf_set cluster.initial_master_nodes "${master_list[@]}"
-            fi
+        elasticsearch_conf_set discovery.seed_hosts "${host_list[@]}"
+        if is_node_type_master; then
+            elasticsearch_conf_set cluster.initial_master_nodes "${master_list[@]}"
         fi
         elasticsearch_conf_set discovery.initial_state_timeout "5m"
     else
@@ -766,7 +742,7 @@ elasticsearch_initialize() {
         fi
     fi
 
-    if is_file_writable "${ELASTICSEARCH_CONF_DIR}/jvm.options" && ([[ "$es_major_version" -le 6 ]] || is_file_writable "${ELASTICSEARCH_CONF_DIR}/jvm.options.d"); then
+    if is_file_writable "${ELASTICSEARCH_CONF_DIR}/jvm.options" && is_file_writable "${ELASTICSEARCH_CONF_DIR}/jvm.options.d"; then
         if is_boolean_yes "$ELASTICSEARCH_DISABLE_JVM_HEAP_DUMP"; then
             info "Disabling JVM heap dumps..."
             replace_in_file "${ELASTICSEARCH_CONF_DIR}/jvm.options" "-XX:[+]HeapDumpOnOutOfMemoryError" "# -XX:+HeapDumpOnOutOfMemoryError"
diff --git a/bitnami/elasticsearch/README.md b/bitnami/elasticsearch/README.md
index 1c3a3b69440f..e1835eeed740 100644
--- a/bitnami/elasticsearch/README.md
+++ b/bitnami/elasticsearch/README.md
@@ -48,9 +48,8 @@ Non-root container images add an extra layer of security and are generally recom
 Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/).
 
 
-* [`8`, `8-debian-10`, `8.1.2`, `8.1.2-debian-10-r0`, `latest` (8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-elasticsearch/blob/8.1.2-debian-10-r0/8/debian-10/Dockerfile)
+* [`8`, `8-debian-10`, `8.1.2`, `8.1.2-debian-10-r1`, `latest` (8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-elasticsearch/blob/8.1.2-debian-10-r1/8/debian-10/Dockerfile)
 * [`7`, `7-debian-10`, `7.17.2`, `7.17.2-debian-10-r3` (7/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-elasticsearch/blob/7.17.2-debian-10-r3/7/debian-10/Dockerfile)
-* [`6`, `6-debian-10`, `6.8.23`, `6.8.23-debian-10-r77` (6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-elasticsearch/blob/6.8.23-debian-10-r77/6/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/elasticsearch GitHub repo](https://github.com/bitnami/bitnami-docker-elasticsearch).
 ## Get this image