diff --git a/Dockerfile b/Dockerfile
index e6124a1..1e4afb0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/pires/docker-elasticsearch:1.7.1-2
+FROM quay.io/pires/docker-elasticsearch:1.5.2
 
 MAINTAINER pjpires@gmail.com
 
@@ -12,4 +12,6 @@ RUN /elasticsearch/bin/plugin -i io.fabric8/elasticsearch-cloud-kubernetes/1.3.0
 ADD elasticsearch.yml /elasticsearch/config/elasticsearch.yml
 
 # Copy run script
-COPY run.sh /
\ No newline at end of file
+COPY run.sh /
+
+CMD ["/run.sh"]
diff --git a/elasticsearch.yml b/elasticsearch.yml
index 0a94dfa..7ff9f1c 100644
--- a/elasticsearch.yml
+++ b/elasticsearch.yml
@@ -2,6 +2,7 @@ cluster:
   name: ${CLUSTER_NAME}
 
 node:
+  name: ${NODE_NAME}
   master: ${NODE_MASTER}
   data: ${NODE_DATA}
 
@@ -17,7 +18,7 @@ http.enabled: ${HTTP_ENABLE}
 
 cloud:
   k8s:
-    service: ${DISCOVERY_SERVICE}
+    service: elasticsearch-discovery
     namespace: ${NAMESPACE}
 discovery:
   type: io.fabric8.elasticsearch.discovery.k8s.K8sDiscoveryModule
diff --git a/run.sh b/run.sh
index a6933ba..8133014 100755
--- a/run.sh
+++ b/run.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 export CLUSTER_NAME=${CLUSTER_NAME:-elasticsearch-default}
+export NODE_NAME=${NODE_NAME:-$HOSTNAME}
 export NODE_MASTER=${NODE_MASTER:-true}
 export NODE_DATA=${NODE_DATA:-true}
 export HTTP_ENABLE=${HTTP_ENABLE:-true}
@@ -9,4 +10,5 @@ export MULTICAST=${MULTICAST:-false}
 export NAMESPACE=${NAMESPACE:-default}
 export DISCOVERY_SERVICE=${DISCOVERY_SERVICE:-elasticsearch-discovery}
 
-/elasticsearch/bin/elasticsearch
\ No newline at end of file
+echo "Discovery is: $DISCOVERY_SERVICE"
+exec /elasticsearch/bin/elasticsearch ${EXTRA_OPTS}
\ No newline at end of file