diff --git a/bitnami/elasticsearch/7/ol-7/Dockerfile b/bitnami/elasticsearch/7/ol-7/Dockerfile
index 0a1f4b1b59df..1a2b3c07880e 100644
--- a/bitnami/elasticsearch/7/ol-7/Dockerfile
+++ b/bitnami/elasticsearch/7/ol-7/Dockerfile
@@ -1,4 +1,4 @@
-FROM bitnami/oraclelinux-extras-base:7-r447
+FROM bitnami/oraclelinux-extras-base:7-r457
 LABEL maintainer "Bitnami <containers@bitnami.com>"
 
 ENV BITNAMI_PKG_CHMOD="-R g+rwX" \
@@ -9,13 +9,13 @@ ENV BITNAMI_PKG_CHMOD="-R g+rwX" \
 
 # Install required system packages and dependencies
 RUN install_packages alsa-lib-devel freetype-devel glibc hostname libX11-devel libXext-devel libXi-devel libXrender-devel libXtst-devel libgcc zlib
-RUN . ./libcomponent.sh && component_unpack "java" "11.0.4-1" --checksum 17fdf204e88a92168b38d4f464876255fb6b651de8c889a4bb8340b39a860261
+RUN . ./libcomponent.sh && component_unpack "java" "11.0.5-0" --checksum e45456416649c404add4f02355d6efe6c82f960153a9807e4ba9fea16d28a237
 RUN . ./libcomponent.sh && component_unpack "elasticsearch" "7.4.0-0" --checksum 8bd32f176f20bca1dced2a20b9f646487476763ddb6a21860cfb5a62602134f9
 
 COPY rootfs /
 RUN /postunpack.sh
 ENV BITNAMI_APP_NAME="elasticsearch" \
-    BITNAMI_IMAGE_VERSION="7.4.0-ol-7-r13" \
+    BITNAMI_IMAGE_VERSION="7.4.0-ol-7-r14" \
     LD_LIBRARY_PATH="/opt/bitnami/elasticsearch/jdk/lib:/opt/bitnami/elasticsearch/jdk/lib/server:$LD_LIBRARY_PATH" \
     NAMI_PREFIX="/.nami" \
     PATH="/opt/bitnami/java/bin:/opt/bitnami/elasticsearch/bin:$PATH"
diff --git a/bitnami/elasticsearch/7/ol-7/rootfs/libelasticsearch.sh b/bitnami/elasticsearch/7/ol-7/rootfs/libelasticsearch.sh
index 8e8680520b96..2cff09dca232 100644
--- a/bitnami/elasticsearch/7/ol-7/rootfs/libelasticsearch.sh
+++ b/bitnami/elasticsearch/7/ol-7/rootfs/libelasticsearch.sh
@@ -14,6 +14,27 @@
 
 # Functions
 
+########################
+# Write a configuration setting value
+# Globals:
+#   ELASTICSEARCH_CONF_FILE
+# Arguments:
+#   $1 - key
+#   $2 - value
+# Returns:
+#   None
+#########################
+elasticsearch_conf_write() {
+    local key="${1:?missing key}"
+    local value="${2:?missing value}"
+
+    if [[ -s "$ELASTICSEARCH_CONF_FILE" ]]; then
+        yq w -i "$ELASTICSEARCH_CONF_FILE" "$key" "$value"
+    else
+        yq n "$key" "$value" > "$ELASTICSEARCH_CONF_FILE"
+    fi
+}
+
 ########################
 # Set a configuration setting value
 # Globals:
@@ -25,18 +46,20 @@
 #   None
 #########################
 elasticsearch_conf_set() {
-    local name="${1:?missing key}"
+    local key="${1:?missing key}"
     shift
     local values=("${@}")
 
     if [[ "${#values[@]}" -eq 0 ]]; then
-        stderr_print "missing value"
+        stderr_print "missing values"
         return 1
-    elif [[ "${#values[@]}" -eq 1 ]]; then
-        yq w -i "$ELASTICSEARCH_CONF_FILE" "$name" "${values[0]}"
+    elif [[ "${#values[@]}" -eq 1 ]] && [[ -n "${values[0]}" ]]; then
+        elasticsearch_conf_write "$key" "${values[0]}"
     else
         for i in "${!values[@]}"; do
-            yq w -i "$ELASTICSEARCH_CONF_FILE" "${name}[${i}]" "${values[$i]}"
+            if [[ -n "${values[$i]}" ]]; then
+                elasticsearch_conf_write "$key" "${values[$i]}"
+            fi
         done
     fi
 }
@@ -244,7 +267,7 @@ elasticsearch_cluster_configuration() {
         fi
     }
 
-    info "Configuration Elasticsearch cluster settings..."
+    info "Configuring Elasticsearch cluster settings..."
     elasticsearch_conf_set network.host "$(get_machine_ip)"
     elasticsearch_conf_set network.publish_host "$(get_machine_ip)"
     elasticsearch_conf_set network.bind_host "$(bind_address)"
@@ -412,10 +435,9 @@ elasticsearch_initialize() {
 
     if [[ -f "$ELASTICSEARCH_CONF_FILE" ]]; then
         info "Custom configuration file detected, using it..."
-        rm -rf "$ELASTICSEARCH_CONFDIR/es_config.sample"
     else
         info "Setting default configuration"
-        mv "$ELASTICSEARCH_CONFDIR/es_config.sample" "$ELASTICSEARCH_CONF_FILE"
+        touch "$ELASTICSEARCH_CONF_FILE"
         elasticsearch_conf_set http.port "$ELASTICSEARCH_PORT_NUMBER"
         elasticsearch_conf_set path.data "$ELASTICSEARCH_DATADIR"
         elasticsearch_conf_set transport.tcp.port "$ELASTICSEARCH_NODE_PORT_NUMBER"
diff --git a/bitnami/elasticsearch/README.md b/bitnami/elasticsearch/README.md
index 149c9e98dc73..e70b813350a8 100644
--- a/bitnami/elasticsearch/README.md
+++ b/bitnami/elasticsearch/README.md
@@ -46,7 +46,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/).
 
 
-* [`7-ol-7`, `7.4.0-ol-7-r13` (7/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-elasticsearch/blob/7.4.0-ol-7-r13/7/ol-7/Dockerfile)
+* [`7-ol-7`, `7.4.0-ol-7-r14` (7/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-elasticsearch/blob/7.4.0-ol-7-r14/7/ol-7/Dockerfile)
 * [`7-debian-9`, `7.4.0-debian-9-r9`, `7`, `7.4.0`, `7.4.0-r9`, `latest` (7/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-elasticsearch/blob/7.4.0-debian-9-r9/7/debian-9/Dockerfile)
 * [`6-ol-7`, `6.8.3-ol-7-r41` (6/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-elasticsearch/blob/6.8.3-ol-7-r41/6/ol-7/Dockerfile)
 * [`6-debian-9`, `6.8.3-debian-9-r38`, `6`, `6.8.3`, `6.8.3-r38` (6/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-elasticsearch/blob/6.8.3-debian-9-r38/6/debian-9/Dockerfile)