diff --git a/bitnami/elasticsearch/6/debian-10/Dockerfile b/bitnami/elasticsearch/6/debian-10/Dockerfile
index 86437d9b4a3f..049892bd5147 100644
--- a/bitnami/elasticsearch/6/debian-10/Dockerfile
+++ b/bitnami/elasticsearch/6/debian-10/Dockerfile
@@ -13,7 +13,7 @@ COPY prebuildfs /
 # Install required system packages and dependencies
 RUN install_packages acl ca-certificates curl gzip hostname libc6 procps tar zlib1g
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "yq" "3.4.1-0" --checksum c88c76a7b5214407821771e5fc340f0320d5ded19eada938629603a982b8b640
-RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "java" "11.0.10-0" --checksum 68b909cfb5c98625e7d0db5c6eb82a34eca9b8940ada38b7eaa0c238bb510b57
+RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "java" "11.0.11-0" --checksum 8cf28afc1090b0fec1ad841012ead25b59d2d5f4212742c3d62e6007ef57850b
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.12.0-2" --checksum 4d858ac600c38af8de454c27b7f65c0074ec3069880cb16d259a6e40a46bbc50
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "elasticsearch" "6.8.15-0" --checksum 2ea66daacb9ccba17bcb82aabf19be17923c2f0737573e13810bcfd401487718
 RUN chmod g+rwX /opt/bitnami
@@ -21,7 +21,7 @@ RUN chmod g+rwX /opt/bitnami
 COPY rootfs /
 RUN /opt/bitnami/scripts/elasticsearch/postunpack.sh
 ENV BITNAMI_APP_NAME="elasticsearch" \
-    BITNAMI_IMAGE_VERSION="6.8.15-debian-10-r20" \
+    BITNAMI_IMAGE_VERSION="6.8.15-debian-10-r21" \
     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/6/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/elasticsearch/6/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
index 591de65da6f4..dc3e9e607863 100644
--- a/bitnami/elasticsearch/6/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/elasticsearch/6/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -15,10 +15,10 @@
     },
     "java": {
         "arch": "amd64",
-        "digest": "68b909cfb5c98625e7d0db5c6eb82a34eca9b8940ada38b7eaa0c238bb510b57",
+        "digest": "8cf28afc1090b0fec1ad841012ead25b59d2d5f4212742c3d62e6007ef57850b",
         "distro": "debian-10",
         "type": "NAMI",
-        "version": "11.0.10-0"
+        "version": "11.0.11-0"
     },
     "yq": {
         "arch": "amd64",
diff --git a/bitnami/elasticsearch/6/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/elasticsearch/6/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh
index 25bff4a05105..da97ed81c921 100644
--- a/bitnami/elasticsearch/6/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh
+++ b/bitnami/elasticsearch/6/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh
@@ -212,6 +212,7 @@ ensure_web_server_app_configuration_exists() {
             | --apache-before-vhost-configuration \
             | --apache-allow-override \
             | --apache-extra-directory-configuration \
+            | --apache-proxy-address \
             | --apache-move-htaccess \
             )
                 apache_args+=("${1//apache-/}" "${2:?missing value}")
diff --git a/bitnami/elasticsearch/README.md b/bitnami/elasticsearch/README.md
index 8f9c1762fcaf..071399ab65f9 100644
--- a/bitnami/elasticsearch/README.md
+++ b/bitnami/elasticsearch/README.md
@@ -48,7 +48,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 
 * [`7`, `7-debian-10`, `7.12.0`, `7.12.0-debian-10-r15`, `latest` (7/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-elasticsearch/blob/7.12.0-debian-10-r15/7/debian-10/Dockerfile)
 * [`7.10.2`, `7.10.2-debian-10`, `7.10.2-debian-10-r83` (7.10.2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-elasticsearch/blob/7.10.2-debian-10-r83/7.10.2/debian-10/Dockerfile)
-* [`6`, `6-debian-10`, `6.8.15`, `6.8.15-debian-10-r20` (6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-elasticsearch/blob/6.8.15-debian-10-r20/6/debian-10/Dockerfile)
+* [`6`, `6-debian-10`, `6.8.15`, `6.8.15-debian-10-r21` (6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-elasticsearch/blob/6.8.15-debian-10-r21/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