diff --git a/templates/elasticsearch-2/1/docker-compose.yml b/templates/elasticsearch-2/1/docker-compose.yml
new file mode 100644
index 0000000..5dc1785
--- /dev/null
+++ b/templates/elasticsearch-2/1/docker-compose.yml
@@ -0,0 +1,108 @@
+elasticsearch-masters:
+  image: rancher/elasticsearch-conf:v0.5.0
+  labels:
+    io.rancher.container.hostname_override: container_name
+    io.rancher.sidekicks: elasticsearch-base-master,elasticsearch-datavolume-masters
+  volumes_from:
+    - elasticsearch-datavolume-masters
+elasticsearch-datavolume-masters:
+  labels:
+    elasticsearch.datanode.config.version: '0'
+    io.rancher.container.hostname_override: container_name
+    io.rancher.container.start_once: true
+  volumes:
+    - /usr/share/elasticsearch/data
+    - /usr/share/elasticsearch/config
+    - /opt/rancher/bin
+  entrypoint: /bin/true
+  image: elasticsearch:2.4.3
+elasticsearch-base-master:
+  labels:
+    elasticsearch.master.config.version: '0'
+    io.rancher.container.hostname_override: container_name
+  image: elasticsearch:2.4.3
+  net: "container:elasticsearch-masters"
+  volumes_from:
+    - elasticsearch-datavolume-masters
+  entrypoint:
+    - /opt/rancher/bin/run.sh
+
+
+elasticsearch-datanodes:
+  image: rancher/elasticsearch-conf:v0.5.0
+  labels:
+    io.rancher.container.hostname_override: container_name
+    io.rancher.sidekicks: elasticsearch-base-datanode,elasticsearch-datavolume-datanode
+    io.rancher.scheduler.affinity:container_label_ne: io.rancher.stack_service.name=$${stack_name}/$${service_name}
+  links:
+    - elasticsearch-masters:es-masters
+  volumes_from:
+    - elasticsearch-datavolume-datanode
+elasticsearch-datavolume-datanode:
+  labels:
+    elasticsearch.datanode.config.version: '0'
+    io.rancher.container.hostname_override: container_name
+    io.rancher.container.start_once: true
+  volumes:
+    - /usr/share/elasticsearch/data
+    - /usr/share/elasticsearch/config
+    - /opt/rancher/bin
+  entrypoint: /bin/true
+  image: elasticsearch:2.4.3
+elasticsearch-base-datanode:
+  labels:
+    elasticsearch.datanode.config.version: '0'
+    io.rancher.container.hostname_override: container_name
+  image: elasticsearch:2.4.3
+  links:
+    - elasticsearch-masters:es-masters
+  entrypoint:
+    - /opt/rancher/bin/run.sh
+  volumes_from:
+    - elasticsearch-datavolume-datanode
+  net: "container:elasticsearch-datanodes"
+
+
+elasticsearch-clients:
+  image: rancher/elasticsearch-conf:v0.5.0
+  labels:
+    io.rancher.container.hostname_override: container_name
+    io.rancher.sidekicks: elasticsearch-base-clients,elasticsearch-datavolume-clients
+  links:
+    - elasticsearch-masters:es-masters
+  volumes_from:
+    - elasticsearch-datavolume-clients
+elasticsearch-datavolume-clients:
+  labels:
+    elasticsearch.datanode.config.version: '0'
+    io.rancher.container.hostname_override: container_name
+    io.rancher.container.start_once: true
+  volumes:
+    - /usr/share/elasticsearch/data
+    - /usr/share/elasticsearch/config
+    - /opt/rancher/bin
+  entrypoint: /bin/true
+  image: elasticsearch:2.4.3
+elasticsearch-base-clients:
+  labels:
+    elasticsearch.client.config.version: '0'
+    io.rancher.container.hostname_override: container_name
+  image: elasticsearch:2.4.3
+  volumes_from:
+    - elasticsearch-datavolume-clients
+  net: "container:elasticsearch-clients"
+  entrypoint:
+    - /opt/rancher/bin/run.sh
+
+
+kopf:
+  image: rancher/kopf:v0.4.0
+  ports:
+    - "${kopf_port}:80"
+  environment:
+    KOPF_SERVER_NAME: 'es.dev'
+    KOPF_ES_SERVERS: 'es-clients:9200'
+  labels:
+    io.rancher.container.hostname_override: container_name
+  links:
+    - elasticsearch-clients:es-clients
diff --git a/templates/elasticsearch-2/1/rancher-compose.yml b/templates/elasticsearch-2/1/rancher-compose.yml
new file mode 100644
index 0000000..bf4bd66
--- /dev/null
+++ b/templates/elasticsearch-2/1/rancher-compose.yml
@@ -0,0 +1,45 @@
+.catalog:
+  name: "Elasticsearch"
+  version: "2.4.3-rancher1"
+  description: "Elasticsearch. You know, for search"
+  questions:
+    - variable: cluster_name
+      description: "Unique name to assign to your Elasticsearch cluster."
+      label: "Cluster Name"
+      type: "string"
+      required: true
+      default: "es"
+    - variable: "kopf_port"
+      label: "Public Port"
+      description: "Unique public port for kopf"
+      type: "int"
+      default: 80
+      required: true
+elasticsearch-masters:
+  metadata:
+    elasticsearch:
+      yml:
+        cluster.name: "${cluster_name}"
+        node.name: "$${HOSTNAME}"
+        node.data: "false"
+        node.master: "true"
+        network.host: "_site_"
+elasticsearch-datanodes:
+  metadata:
+    elasticsearch:
+      yml:
+        cluster.name: "${cluster_name}"
+        node.name: "$${HOSTNAME}"
+        node.data: "true"
+        node.master: "false"
+        http.enabled: "false"
+        network.host: "_site_"
+elasticsearch-clients:
+  metadata:
+    elasticsearch:
+      yml:
+       cluster.name: "${cluster_name}"
+       node.name: "$${HOSTNAME}"
+       node.data: "false"
+       node.master: "false"
+       network.host: "_site_"
diff --git a/templates/elasticsearch-2/config.yml b/templates/elasticsearch-2/config.yml
index deab91f..a96939b 100644
--- a/templates/elasticsearch-2/config.yml
+++ b/templates/elasticsearch-2/config.yml
@@ -1,5 +1,5 @@
 name: Elasticsearch 2.x
 description: |
   Elasticsearch, you know for search!
-version: 2.2.2-rancher1
+version: 2.4.3-rancher1
 category: ELK