diff --git a/README.md b/README.md
index 83f4183..463df47 100644
--- a/README.md
+++ b/README.md
@@ -4,8 +4,6 @@
 
 Run the latest version of the ELK (Elasticseach, Logstash, Kibana) stack with Docker and Docker-compose.
 
-**Note**: This version has [X-Pack support](https://www.elastic.co/products/x-pack).
-
 It will give you the ability to analyze any data set by using the searching/aggregation capabilities of Elasticseach and the visualization power of Kibana.
 
 Based on the official images:
@@ -14,6 +12,11 @@ Based on the official images:
 * [logstash](https://registry.hub.docker.com/_/logstash/)
 * [kibana](https://registry.hub.docker.com/_/kibana/)
 
+**Note**: Other branches in this project are available:
+
+* ELK 5 with X-Pack support: https://github.com/deviantony/docker-elk/tree/x-pack
+* ELK 5 in Vagrant: https://github.com/deviantony/docker-elk/tree/vagrant
+
 # Requirements
 
 ## Setup
diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile
index 3cc27b2..f2cdff9 100644
--- a/elasticsearch/Dockerfile
+++ b/elasticsearch/Dockerfile
@@ -2,6 +2,4 @@ FROM elasticsearch:5
 
 ENV ES_JAVA_OPTS="-Des.path.conf=/etc/elasticsearch"
 
-RUN elasticsearch-plugin install --batch x-pack
-
 CMD ["-E", "network.host=0.0.0.0", "-E", "discovery.zen.minimum_master_nodes=1"]
diff --git a/kibana/Dockerfile b/kibana/Dockerfile
index a6760b8..ac8bf8a 100644
--- a/kibana/Dockerfile
+++ b/kibana/Dockerfile
@@ -5,6 +5,4 @@ RUN apt-get update && apt-get install -y netcat bzip2
 COPY entrypoint.sh /tmp/entrypoint.sh
 RUN chmod +x /tmp/entrypoint.sh
 
-RUN kibana-plugin install x-pack
-
 CMD ["/tmp/entrypoint.sh"]
diff --git a/logstash/config/logstash.conf b/logstash/config/logstash.conf
index 14c76f8..10e442e 100644
--- a/logstash/config/logstash.conf
+++ b/logstash/config/logstash.conf
@@ -9,7 +9,5 @@ input {
 output {
 	elasticsearch {
 		hosts => "elasticsearch:9200"
-		user => "elastic"
-		password => "changeme"
 	}
 }