diff --git a/bitnami/elasticsearch/6/ol-7/Dockerfile b/bitnami/elasticsearch/6/ol-7/Dockerfile
index 5fb11d328d76..3e39b130ca4e 100644
--- a/bitnami/elasticsearch/6/ol-7/Dockerfile
+++ b/bitnami/elasticsearch/6/ol-7/Dockerfile
@@ -1,4 +1,4 @@
-FROM bitnami/oraclelinux-extras-base:7-r86
+FROM bitnami/oraclelinux-extras-base:7-r87
 LABEL maintainer "Bitnami <containers@bitnami.com>"
 
 ENV BITNAMI_PKG_CHMOD="-R g+rwX" \
@@ -8,14 +8,14 @@ ENV BITNAMI_PKG_CHMOD="-R g+rwX" \
     OS_NAME="linux"
 
 # Install required system packages and dependencies
-RUN install_packages glib2 glibc libblkid libffi libgcc libmount libselinux libstdc++ libuuid pcre zlib
-RUN . ./libcomponent.sh && component_unpack "java" "1.8.181-1" --checksum 6e7fc2779b6e0e3c6c0a2687b1d747d8a427594ff80b8c94b055c839e387e6b1
-RUN . ./libcomponent.sh && component_unpack "elasticsearch" "6.4.2-1" --checksum 86c5527ce3797faf057dda583c1650ee423b370589dc8ed05ed07139aa42705d
+RUN install_packages glib2 glibc libblkid libffi libgcc libmount libselinux libuuid pcre zlib
+RUN . ./libcomponent.sh && component_unpack "java" "1.8.191-0" --checksum b5815af4fe18301a0aebb58ae6fdb84444173c14f15252e8d8fe4015c454a43d
+RUN . ./libcomponent.sh && component_unpack "elasticsearch" "6.4.2-2" --checksum 555510f5ea5d05646c087062dcfefafad3b3811c2c1011e248ad818d28184cb3
 
 COPY rootfs /
 RUN /prepare.sh
 ENV BITNAMI_APP_NAME="elasticsearch" \
-    BITNAMI_IMAGE_VERSION="6.4.2-ol-7-r16" \
+    BITNAMI_IMAGE_VERSION="6.4.2-ol-7-r17" \
     ELASTICSEARCH_BIND_ADDRESS="" \
     ELASTICSEARCH_CLUSTER_HOSTS="" \
     ELASTICSEARCH_CLUSTER_NAME="elasticsearch-cluster" \
diff --git a/bitnami/elasticsearch/README.md b/bitnami/elasticsearch/README.md
index c46f1652076e..3fdadb67f1c4 100644
--- a/bitnami/elasticsearch/README.md
+++ b/bitnami/elasticsearch/README.md
@@ -49,7 +49,7 @@ 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/containers/how-to/understand-rolling-tags-containers/).
 
 
-* [`6-ol-7`, `6.4.2-ol-7-r16` (6/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-elasticsearch/blob/6.4.2-ol-7-r16/6/ol-7/Dockerfile)
+* [`6-ol-7`, `6.4.2-ol-7-r17` (6/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-elasticsearch/blob/6.4.2-ol-7-r17/6/ol-7/Dockerfile)
 * [`6-debian-9`, `6.4.2-debian-9-r17`, `6`, `6.4.2`, `6.4.2-r17`, `latest` (6/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-elasticsearch/blob/6.4.2-debian-9-r17/6/debian-9/Dockerfile)
 * [`5-ol-7`, `5.6.12-ol-7-r14` (5/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-elasticsearch/blob/5.6.12-ol-7-r14/5/ol-7/Dockerfile)
 * [`5-debian-9`, `5.6.12-debian-9-r15`, `5`, `5.6.12`, `5.6.12-r15` (5/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-elasticsearch/blob/5.6.12-debian-9-r15/5/debian-9/Dockerfile)