diff --git a/circle.yml b/circle.yml
index 0d00f90..76f2c43 100644
--- a/circle.yml
+++ b/circle.yml
@@ -4,7 +4,7 @@ machine:
   java:
     version: openjdk8
   environment:
-      ES_VERSION: 5.5.2
+      ES_VERSION: 5.6.16
 
 dependencies:
   pre:
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..66570a1
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,11 @@
+version: '3.6'
+services:
+  elasticsearch:
+    image: elasticsearch:5.6-alpine
+    ports:
+      - 9200:9200
+    environment:
+      - cluster.name=docker-cluster
+      - bootstrap.memory_lock=true
+      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
+      - HTTP_EXPOSE=9200
diff --git a/install-elasticsearch.sh b/install-elasticsearch.sh
index 55821f1..b58e945 100644
--- a/install-elasticsearch.sh
+++ b/install-elasticsearch.sh
@@ -3,7 +3,7 @@
 echo ">>> Installing Elasticsearch"
 
 # Set some variables
-ELASTICSEARCH_VERSION=5.5.2 # Check http://www.elasticsearch.org/download/ for latest version
+ELASTICSEARCH_VERSION=5.6.16 # Check http://www.elasticsearch.org/download/ for latest version
 
 # Install prerequisite: Java8
 echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | sudo /usr/bin/debconf-set-selections