diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile
index 1d6adcd9..753fd408 100644
--- a/elasticsearch/Dockerfile
+++ b/elasticsearch/Dockerfile
@@ -14,7 +14,7 @@ ENV ES_HOME /usr/share/elasticsearch-$ES_VERSION
 RUN useradd -d $ES_HOME -M -r elasticsearch && \
   chown -R elasticsearch: $ES_HOME
 
-RUN mkdir /data /conf && touch /data/.ENABLED /conf/.ENABLED && chown -R elasticsearch: /data /conf
+RUN mkdir /data /conf && touch /data/.CREATED /conf/.CREATED && chown -R elasticsearch: /data /conf
 VOLUME ["/data","/conf"]
 
 ADD start /start
diff --git a/elasticsearch/start b/elasticsearch/start
index 21f057aa..df8827f4 100755
--- a/elasticsearch/start
+++ b/elasticsearch/start
@@ -10,7 +10,11 @@ if [ ! -e /conf/logging.* ]; then
   cp $ES_HOME/config/logging.yml /conf
 fi
 
-OPTS="-Des.path.conf=/conf -Des.path.data=/data"
+OPTS="-Des.path.conf=/conf \
+  -Des.path.data=/data \
+  -Des.path.logs=/data \
+  -Des.transport.tcp.port=9300 \
+  -Des.http.port=9200"
 
 if [ -n "$CLUSTER" ]; then
   OPTS="$OPTS -Des.cluster.name=$CLUSTER"
@@ -21,5 +25,9 @@ fi
 if [ -n "$UNICAST_HOSTS" ]; then
   OPTS="$OPTS -Des.discovery.zen.ping.unicast.hosts=$UNICAST_HOSTS"
 fi
+if [ -n "$PUBLISH_AS" ]; then
+  OPTS="$OPTS -Des.transport.publish_host=$(echo $PUBLISH_AS | awk -F: '{print $1}')"
+  OPTS="$OPTS -Des.transport.publish_port=$(echo $PUBLISH_AS | awk -F: '{if ($2) print $2; else print 9300}')"
+fi
 
 $ES_HOME/bin/elasticsearch $OPTS