diff --git a/.docker/elasticsearch/Dockerfile b/.docker/elasticsearch/Dockerfile
index d07afb0..508730b 100755
--- a/.docker/elasticsearch/Dockerfile
+++ b/.docker/elasticsearch/Dockerfile
@@ -1,8 +1,7 @@
-FROM docker.elastic.co/elasticsearch/elasticsearch:5.6.2
+FROM docker.elastic.co/elasticsearch/elasticsearch-oss:6.2.4
 
 RUN bin/elasticsearch-plugin install analysis-icu --batch
 RUN bin/elasticsearch-plugin install ingest-attachment --batch
-RUN bin/elasticsearch-plugin remove x-pack --purge
 
 ENV ES_JAVA_OPTS "-Xms1g -Xmx1g"
 
diff --git a/.docker/kibana/Dockerfile b/.docker/kibana/Dockerfile
index d4588c4..f48929e 100644
--- a/.docker/kibana/Dockerfile
+++ b/.docker/kibana/Dockerfile
@@ -1,7 +1,5 @@
-FROM docker.elastic.co/kibana/kibana:5.6.2
+FROM docker.elastic.co/kibana/kibana-oss:6.2.4
 
 ENV ELASTICSEARCH_URL "http://elasticsearch:9200"
 
-RUN bin/kibana-plugin remove x-pack
-
 EXPOSE 5601:5601
\ No newline at end of file
diff --git a/.docker/logstash/Dockerfile b/.docker/logstash/Dockerfile
index fc9c6a0..e6ca297 100644
--- a/.docker/logstash/Dockerfile
+++ b/.docker/logstash/Dockerfile
@@ -1,8 +1,7 @@
-FROM docker.elastic.co/logstash/logstash:5.6.2
+FROM docker.elastic.co/logstash/logstash:6.2.4
 
 WORKDIR /usr/share/logstash
 RUN bin/logstash-plugin install logstash-input-jdbc
-RUN bin/logstash-plugin remove x-pack
 RUN bin/logstash-plugin install logstash-filter-json_encode
 RUN bin/logstash-plugin install logstash-filter-json
 RUN bin/logstash-plugin install logstash-filter-mutate