diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile
index f1016a78..ae12733c 100755
--- a/elasticsearch/Dockerfile
+++ b/elasticsearch/Dockerfile
@@ -4,7 +4,7 @@ MAINTAINER itzg
 
 RUN apk -U add bash
 
-ENV ES_VERSION=5.3.1
+ENV ES_VERSION=5.3.2
 
 ADD https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-$ES_VERSION.tar.gz /tmp/es.tgz
 RUN cd /usr/share && \
diff --git a/elasticsearch/docker-compose-test.yml b/elasticsearch/docker-compose-test.yml
new file mode 100644
index 00000000..76b1cba2
--- /dev/null
+++ b/elasticsearch/docker-compose-test.yml
@@ -0,0 +1,44 @@
+version: '3'
+
+services:
+  master:
+    build: .
+    environment:
+      TYPE: MASTER
+      UNICAST_HOSTS: master
+      MIN_MASTERS: 1
+    deploy:
+      replicas: 1
+      update_config:
+        parallelism: 1
+  data:
+    build: .
+    environment:
+      TYPE: DATA
+      UNICAST_HOSTS: master
+    deploy:
+      replicas: 2
+      update_config:
+        parallelism: 1
+        delay: 60s
+  gateway:
+    build: .
+    ports:
+      - "9200:9200"
+      - "9300:9300"
+    environment:
+      TYPE: GATEWAY
+      UNICAST_HOSTS: master
+  ingest:
+    build: .
+    ports:
+      - "9222:9200"
+    environment:
+      TYPE: INGEST
+      UNICAST_HOSTS: master
+  kibana:
+    image: kibana
+    ports:
+      - "5601:5601"
+    environment:
+      ELASTICSEARCH_URL: http://gateway:9200
diff --git a/elasticsearch/start b/elasticsearch/start
index b6de6c86..94a98efe 100755
--- a/elasticsearch/start
+++ b/elasticsearch/start
@@ -20,7 +20,7 @@ discoverIpFromLink() {
 }
 
 discoverAllGlobalIps() {
-  if [ ${#IGNORE_NETWORK} -eq 0 ] 
+  if [ ${#IGNORE_NETWORK} -eq 0 ]
   then
     IGNORE_NETWORK='999.999.999.999'
   fi