diff --git a/elastic-search-5/Dockerfile b/elastic-search-5/Dockerfile
new file mode 100644
index 0000000..55351a4
--- /dev/null
+++ b/elastic-search-5/Dockerfile
@@ -0,0 +1,13 @@
+ARG IMAGE_NAME
+ARG IMAGE_VERSION
+FROM ${IMAGE_NAME}:${IMAGE_VERSION}
+
+RUN bin/elasticsearch-plugin install x-pack
+
+ADD elasticsearch.yml /usr/share/elasticsearch/config/
+
+USER root
+
+RUN chown elasticsearch:elasticsearch config/elasticsearch.yml
+
+USER elasticsearch
diff --git a/elastic-search-5/elasticsearch.yml b/elastic-search-5/elasticsearch.yml
new file mode 100644
index 0000000..59d01ae
--- /dev/null
+++ b/elastic-search-5/elasticsearch.yml
@@ -0,0 +1,12 @@
+http:
+    host: 0.0.0.0
+transport:
+    host: 127.0.0.1
+xpack:
+    security:
+        enabled: false
+        authc:
+            anonymous:
+                roles:
+                  - role1
+                  - role2
diff --git a/elastic-search-5/run.sh b/elastic-search-5/run.sh
new file mode 100755
index 0000000..591f89c
--- /dev/null
+++ b/elastic-search-5/run.sh
@@ -0,0 +1,67 @@
+#!/usr/bin/env bash
+
+SCRIPT_PATH=$( cd "$(dirname "$0")" ; pwd -P )
+
+IMAGE_NAME="elasticsearch"
+IMAGE_VERSION="5.3.2"
+
+SERVICE_NAME=ys-elastic-search
+
+
+source ${SCRIPT_PATH}/../common.shinc
+
+#
+# Project specific variables
+#
+
+DOMAIN_NAME="elastic.loc"
+
+RELEASE_NAME="yoursystemcz/elasticsearch"
+RELEASE_VERSION="5.3.2"
+
+PERSISTENT_VOLUME="ys-elastic-5"
+
+source ${SCRIPT_PATH}/env.shinc 2> /dev/null
+
+
+init() {
+	__init
+
+	# Create networks
+	NETWORKS=(${SEARCH_ENGINE_NETWORK} ${PROXY_NETWORK})
+	__createNetworks
+
+	docker create \
+		--name ${SERVICE_NAME} \
+		-e VIRTUAL_HOST=${DOMAIN_NAME} \
+		-e VIRTUAL_PORT=9200 \
+		-v ${PERSISTENT_VOLUME}:/usr/share/elasticsearch/data \
+		--net ${SEARCH_ENGINE_NETWORK} \
+		${RELEASE_NAME}:${RELEASE_VERSION}
+
+	[[ $? -ne 0 ]] && return 1
+
+	docker network connect ${PROXY_NETWORK} ${SERVICE_NAME}
+
+	__ask_to_start
+}
+
+build() {
+        docker build \
+                --build-arg IMAGE_NAME=${IMAGE_NAME} \
+                --build-arg IMAGE_VERSION=${IMAGE_VERSION} \
+                -t ${RELEASE_NAME}:${RELEASE_VERSION} \
+                ${SCRIPT_PATH}
+}
+
+release() {
+	build
+
+	docker push ${RELEASE_NAME}:${RELEASE_VERSION}
+
+	return $?
+}
+
+"$@"
+
+exit $?
diff --git a/elastic-search-6/Dockerfile b/elastic-search-6/Dockerfile
new file mode 100644
index 0000000..55351a4
--- /dev/null
+++ b/elastic-search-6/Dockerfile
@@ -0,0 +1,13 @@
+ARG IMAGE_NAME
+ARG IMAGE_VERSION
+FROM ${IMAGE_NAME}:${IMAGE_VERSION}
+
+RUN bin/elasticsearch-plugin install x-pack
+
+ADD elasticsearch.yml /usr/share/elasticsearch/config/
+
+USER root
+
+RUN chown elasticsearch:elasticsearch config/elasticsearch.yml
+
+USER elasticsearch
diff --git a/elastic-search-6/elasticsearch.yml b/elastic-search-6/elasticsearch.yml
new file mode 100644
index 0000000..59d01ae
--- /dev/null
+++ b/elastic-search-6/elasticsearch.yml
@@ -0,0 +1,12 @@
+http:
+    host: 0.0.0.0
+transport:
+    host: 127.0.0.1
+xpack:
+    security:
+        enabled: false
+        authc:
+            anonymous:
+                roles:
+                  - role1
+                  - role2
diff --git a/elastic-search-6/run.sh b/elastic-search-6/run.sh
new file mode 100755
index 0000000..24e1c53
--- /dev/null
+++ b/elastic-search-6/run.sh
@@ -0,0 +1,67 @@
+#!/usr/bin/env bash
+
+SCRIPT_PATH=$( cd "$(dirname "$0")" ; pwd -P )
+
+IMAGE_NAME="elasticsearch"
+IMAGE_VERSION="6.4.2"
+
+SERVICE_NAME=ys-elastic-search-6
+
+
+source ${SCRIPT_PATH}/../common.shinc
+
+#
+# Project specific variables
+#
+
+DOMAIN_NAME="elastic.loc"
+
+RELEASE_NAME="yoursystemcz/elasticsearch"
+RELEASE_VERSION="6.4.2"
+
+PERSISTENT_VOLUME="ys-elastic-6"
+
+source ${SCRIPT_PATH}/env.shinc 2> /dev/null
+
+
+init() {
+	__init
+
+	# Create networks
+	NETWORKS=(${SEARCH_ENGINE_NETWORK} ${PROXY_NETWORK})
+	__createNetworks
+
+	docker create \
+		--name ${SERVICE_NAME} \
+		-e VIRTUAL_HOST=${DOMAIN_NAME} \
+		-e VIRTUAL_PORT=9200 \
+		-v ${PERSISTENT_VOLUME}:/usr/share/elasticsearch/data \
+		--net ${SEARCH_ENGINE_NETWORK} \
+		${RELEASE_NAME}:${RELEASE_VERSION}
+
+	[[ $? -ne 0 ]] && return 1
+
+	docker network connect ${PROXY_NETWORK} ${SERVICE_NAME}
+
+	__ask_to_start
+}
+
+build() {
+        docker build \
+                --build-arg IMAGE_NAME=${IMAGE_NAME} \
+                --build-arg IMAGE_VERSION=${IMAGE_VERSION} \
+                -t ${RELEASE_NAME}:${RELEASE_VERSION} \
+                ${SCRIPT_PATH}
+}
+
+release() {
+	build
+
+	docker push ${RELEASE_NAME}:${RELEASE_VERSION}
+
+	return $?
+}
+
+"$@"
+
+exit $?
diff --git a/elastic-search/run.sh b/elastic-search/run.sh
index 51c9f29..f01a69b 100755
--- a/elastic-search/run.sh
+++ b/elastic-search/run.sh
@@ -5,7 +5,6 @@ SCRIPT_PATH=$( cd "$(dirname "$0")" ; pwd -P )
 IMAGE_NAME="elasticsearch"
 # Old version, AWS supported
 IMAGE_VERSION="2.3.5"
-#IMAGE_VERSION="5.3.2"
 
 SERVICE_NAME=ys-elastic-search
 
@@ -21,7 +20,6 @@ DOMAIN_NAME="elastic.loc"
 RELEASE_NAME="yoursystemcz/elasticsearch"
 # Old version, AWS supported
 RELEASE_VERSION="2.3.5"
-#RELEASE_VERSION="5.3.2"
 
 PERSISTENT_VOLUME="ys-elastic"