diff --git a/bitnami/elasticsearch/5/Dockerfile b/bitnami/elasticsearch/5/Dockerfile
index dba9dfd35182..2ace546b08b0 100644
--- a/bitnami/elasticsearch/5/Dockerfile
+++ b/bitnami/elasticsearch/5/Dockerfile
@@ -9,16 +9,18 @@ RUN bitnami-pkg unpack elasticsearch-5.4.0-0 --checksum 24b26b5e863bf6dbe418417f
 COPY rootfs /
 
 ENV BITNAMI_APP_NAME="elasticsearch" \
-    BITNAMI_IMAGE_VERSION="5.4.0-r0" \
+    BITNAMI_IMAGE_VERSION="5.4.0-r1" \
     ELASTICSEARCH_CLIENT_NODE="" \
     ELASTICSEARCH_CLUSTER_HOSTS="" \
     ELASTICSEARCH_CLUSTER_NAME="elasticsearch-cluster" \
     ELASTICSEARCH_NODE_NAME="" \
-    ELASTICSEARCH_NODE_PORT="9300" \
-    ELASTICSEARCH_PORT="9200" \
+    ELASTICSEARCH_NODE_PORT_NUMBER="9300" \
+    ELASTICSEARCH_PORT_NUMBER="9200" \
     ELASTICSEARCH_REMOTE_CONNECTION="true" \
     PATH="/opt/bitnami/java/bin:/opt/bitnami/elasticsearch/bin:$PATH"
 
+
+
 VOLUME ["/bitnami/elasticsearch"]
 
 EXPOSE 9200 9300
diff --git a/bitnami/elasticsearch/5/rootfs/elasticsearch-inputs.json b/bitnami/elasticsearch/5/rootfs/elasticsearch-inputs.json
index 051667f7d3ba..be8e07e8786d 100644
--- a/bitnami/elasticsearch/5/rootfs/elasticsearch-inputs.json
+++ b/bitnami/elasticsearch/5/rootfs/elasticsearch-inputs.json
@@ -4,6 +4,6 @@
   "enableRemoteConnection": "{{$global.env.ELASTICSEARCH_REMOTE_CONNECTION}}",
   "isClientNode": "{{$global.env.ELASTICSEARCH_CLIENT_NODE}}",
   "nodeName": "{{$global.env.ELASTICSEARCH_NODE_NAME}}",
-  "nodePort": "{{$global.env.ELASTICSEARCH_NODE_PORT}}",
-  "port": "{{$global.env.ELASTICSEARCH_PORT}}"
+  "nodePort": "{{$global.env.ELASTICSEARCH_NODE_PORT_NUMBER}}",
+  "port": "{{$global.env.ELASTICSEARCH_PORT_NUMBER}}"
 }
\ No newline at end of file
diff --git a/bitnami/elasticsearch/README.md b/bitnami/elasticsearch/README.md
index f52979e423e5..e4a5ccfff93a 100644
--- a/bitnami/elasticsearch/README.md
+++ b/bitnami/elasticsearch/README.md
@@ -22,7 +22,7 @@ elasticsearch:
 
 ## Kubernetes
 
-> **WARNING**: This is a beta configuration, currently unsupported.
+> **WARNING:** This is a beta configuration, currently unsupported.
 
 Get the raw URL pointing to the kubernetes.yml manifest and use kubectl to create the resources on your Kubernetes cluster like so:
 
@@ -159,19 +159,19 @@ $ docker-compose up -d
 elasticsearch:
   image: bitnami/elasticsearch:latest
   environment:
-    - ELASTICSEARCH_PORT=9201
+    - ELASTICSEARCH_PORT_NUMBER=9201
 ```
 
  * For manual execution add a `-e` option with each variable and value:
 
 ```
- $ docker run -d -e ELASTICSEARCH_PORT=9201 -p 9201:9201 --name elasticsearch -v /your/local/path/bitnami/elasticsearch:/bitnami/elasticsearch --network=elasticsearch_network bitnami/elasticsearch
+ $ docker run -d -e ELASTICSEARCH_PORT_NUMBER=9201 -p 9201:9201 --name elasticsearch -v /your/local/path/bitnami/elasticsearch:/bitnami/elasticsearch --network=elasticsearch_network bitnami/elasticsearch
 ```
 
 Available variables:
 
- - `ELASTICSEARCH_PORT`: Elasticsearch port. Default: **9200**
- - `ELASTICSEARCH_NODEPORT`: Elasticsearch Node to Node port. Default: **9300**
+ - `ELASTICSEARCH_PORT_NUMBER`: Elasticsearch port. Default: **9200**
+ - `ELASTICSEARCH_NODE_PORT_NUMBER`: Elasticsearch Node to Node port. Default: **9300**
  - `ELASTICSEARCH_CLUSTER_NAME`: The Elasticsearch Cluster Name. Default: **elasticsearch-cluster**
  - `ELASTICSEARCH_CLUSTER_HOSTS`: List of elasticsearch hosts to set the cluster. Available separatos are ' ', ',' and ';' .No defaults.
  - `ELASTICSEARCH_CLIENT_NODE`: Elasticsearch node to behave as a 'smart router' for Kibana app. Default: **false**