diff --git a/Dockerfile b/Dockerfile
index 91ca5c8..a5850d1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,8 @@
-FROM elasticsearch:2.4.0
+FROM elasticsearch:5.5.2
 
-RUN bin/plugin install lmenezes/elasticsearch-kopf/v2.1.2
-RUN bin/plugin install io.fabric8/elasticsearch-cloud-kubernetes/2.4.0_01
+RUN bin/elasticsearch-plugin install io.fabric8:elasticsearch-cloud-kubernetes:5.5.2
 
-ENV BOOTSTRAP_MLOCKALL=false NODE_DATA=true NODE_MASTER=true JAVA_OPTS=-Djava.net.preferIPv4Stack=true
+ENV BOOTSTRAP_MEMORY_LOCK=false NODE_DATA=true NODE_MASTER=true MINIMUM_MASTER_NODES=1 ES_JAVA_OPTS=-Djava.net.preferIPv4Stack=true
 
 # pre-stop-hook.sh and dependencies
 RUN apt-get update && apt-get install -y \
diff --git a/Makefile b/Makefile
index ee717e8..349ea1f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 IMAGE_NAME=simonswine/elasticsearch-pet
-IMAGE_TAG=2.3.4
+IMAGE_TAG=5.5.0
 REPO=$(IMAGE_NAME):$(IMAGE_TAG)
 
 build:
diff --git a/README.md b/README.md
index d5afc62..86f5115 100644
--- a/README.md
+++ b/README.md
@@ -7,5 +7,4 @@ This image is using Fabric8's great work around the [kubernetes plugin](https://
 ## Changes for PetSet
 
 - Use Pod's hostname as elasticsearch host name
-- Add [kopf](https://github.com/lmenezes/elasticsearch-kopf) plugin as elasticsearch UI
 - Handle downscales so that no data loss occurs (using lifecycle hooks)
diff --git a/elasticsearch.yml b/elasticsearch.yml
index 369d573..ae69fff 100644
--- a/elasticsearch.yml
+++ b/elasticsearch.yml
@@ -1,8 +1,10 @@
-node.data: ${NODE_DATA}
-node.master: ${NODE_MASTER}
-node.name: ${HOSTNAME}
+node:
+  data: ${NODE_DATA}
+  master: ${NODE_MASTER}
+  name: ${HOSTNAME}
 
-bootstrap.mlockall: ${BOOTSTRAP_MLOCKALL}
+bootstrap:
+  memory_lock: ${BOOTSTRAP_MEMORY_LOCK}
 
 network.host: 0.0.0.0
 
@@ -12,7 +14,6 @@ cloud:
     namespace: ${KUBERNETES_NAMESPACE}
 
 discovery:
-  type: kubernetes
-
-path:
-  plugins: /usr/share/elasticsearch/plugins
+  zen:
+    minimum_master_nodes: ${MINIMUM_MASTER_NODES}
+    hosts_provider: kubernetes