diff --git a/docker-compose.yaml b/docker-compose.yaml
index f2df129..f9a5483 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -11,7 +11,7 @@
       - kibana
 
  kibana:
-    image: docker.elastic.co/kibana/kibana:5.5.2
+    build: kibana
     ports:
       - "5601:5601"
     networks:
@@ -20,7 +20,7 @@
       - elasticsearch
 
  elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:5.5.2
+    build: elasticsearch
     ports:
       - "9200:9200"
       - "9300:9300"
@@ -28,7 +28,6 @@
       - ES_JAVA_OPTS=-Xmx256m -Xms256m
       - http.host=0.0.0.0
       - http.publish_host=127.0.0.1
-      - xpack.security.enabled=false
     networks:
       - ek
 
diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile
new file mode 100644
index 0000000..42cf0d2
--- /dev/null
+++ b/elasticsearch/Dockerfile
@@ -0,0 +1,2 @@
+FROM docker.elastic.co/elasticsearch/elasticsearch:5.5.2
+RUN elasticsearch-plugin remove x-pack
diff --git a/kibana/Dockerfile b/kibana/Dockerfile
new file mode 100644
index 0000000..e16ba65
--- /dev/null
+++ b/kibana/Dockerfile
@@ -0,0 +1,2 @@
+FROM docker.elastic.co/kibana/kibana:5.5.2
+RUN kibana-plugin remove x-pack