diff --git a/README.md b/README.md
index 501a20f..b4cb2f6 100644
--- a/README.md
+++ b/README.md
@@ -5,16 +5,17 @@ Kubernetes Cloud Plugin for Elasticsearch:
 
 The Kubernetes Cloud plugin allows to use Kubernetes API for the unicast discovery mechanism.
 
-## Version 1.0.x for Elasticsearch: 1.4
-## Version 1.1.x/1.2.x for Elasticsearch: 1.5
-## Version 1.3.x for Elasticsearch: 1.6
-
 Installation
 ============
 ```
-plugin install io.fabric8/elasticsearch-cloud-kubernetes/1.2.1
+plugin install io.fabric8/elasticsearch-cloud-kubernetes/1.7.6
 ```
 
+Versions available
+==================
+
+* `1.7.6` for Elasticsearch `1.7.6`
+
 Kubernetes Pod Discovery
 ===============================
 
@@ -22,11 +23,14 @@ Kubernetes Pod discovery allows to use the kubernetes APIs to perform automatic
 Here is a simple sample configuration:
 
 ```yaml
+discovery:
+
 cloud:
   k8s:
     servicedns: ${SERVICE_DNS}
-discovery:
-    type: io.fabric8.elasticsearch.discovery.k8s.K8sDiscoveryModule
+
+discovery:    
+  type: io.fabric8.elasticsearch.discovery.k8s.K8sDiscoveryModule
 
 path:
   data: /data/data
@@ -35,19 +39,6 @@ path:
   work: /data/work
 ```
 
-If you want to use Kubernetes service endpoints instead (remember this will require auth to the
-Kubernetes API server if you do this), then use:
-
-```
-service: ${SERVICE}
-namespace: ${NAMESPACE}
-```
-
-Depending on which once you choose, you can then either:
-
-* Set the `SERVICE` & `NAMESPACE` environment variables to specify the service to discover endpoints for, e.g. `elasticsearch-cluster`.
-* Set the `SERVICE_DNS` environment variable to specify the service name to look up endpoints for in DNS, e.g. `elasticsearch-cluster`.
-
 ## Kubernetes auth
 
 The preferred way to authenticate to Kubernetes is to use [service accounts](https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/design/service_accounts.md).
@@ -57,7 +48,7 @@ As an example, to create a service account do something like:
 
 ```
 cat <<EOF | kubectl create -f -
-apiVersion: v1beta3
+apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: elasticsearch
@@ -68,27 +59,22 @@ This creates a service account called `elasticsearch`. To use this service accou
 to your pod spec or your replication controller pod template spec like this:
 
 ```
-apiVersion: v1beta3
+apiVersion: v1
 kind: Pod
 metadata:
   name: elasticsearch
   <SNIP>
 spec:
-  serviceAccount: elasticsearch
+  serviceAccountName: elasticsearch
   <SNIP>
 ```
 
 This will mount the service account token at `/var/run/secrets/kubernetes.io/servicaccount/token` & will be automatically
 read by the fabric8 kubernetes client when the request is made to the API server.
 
-There are also a number of different environment variables that you may find useful:
-
-. `KUBERNETES_TRUST_CERT=false`: disable certificate validation. Set to true to trust the Kubernetes API server certificate.
-. `KUBECONFIG`: path to a standard Kubernetes config file to use for authentication configuration.
-
 # Kubernetes example
 
-In this example, we're going to use `servicedns` to look up the Elasticsearch cluster nodes to join.
+In this example, we're going to use a headle service to look up the Elasticsearch cluster nodes to join.
 
 The following manifest uses 3 replication controllers to created Elasticsearch pods in 3 different modes:
 
@@ -101,218 +87,236 @@ We use 2 services as well:
 * One to target the client pods so that all requests to the cluster go through the client nodes
 * A headless service to list all cluster endpoints managed by all 3 RCs.
 
-The DNS lookup is on the headless service name so that all existing nodes from the cluster are discovered on startup & the cluster is joined.
+```yaml
+kind: "List"
+apiVersion: "v1"
+items:
+- apiVersion: "v1"
+  kind: "Service"
+  metadata:
+    name: "elasticsearch"
+  spec:
+    ports:
+      - port: 9200
+        targetPort: "http"
+    selector:
+      component: "elasticsearch"
+      type: "client"
+      provider: "fabric8"
+    type: "LoadBalancer"
+- apiVersion: "v1"
+  kind: "Service"
+  metadata:
+    name: "elasticsearch-cluster"
+  spec:
+    clusterIP: "None"
+    ports:
+      - port: 9300
+        targetPort: 9300
+    selector:
+      provider: "fabric8"
+      component: "elasticsearch"
+- apiVersion: "v1"
+  kind: "ReplicationController"
+  metadata:
+    name: "elasticsearch-data"
+  spec:
+    replicas: 1
+    selector:
+      component: "elasticsearch"
+      type: "data"
+      provider: "fabric8"
+    template:
+      metadata:
+        labels:
+          component: "elasticsearch"
+          type: "data"
+          provider: "fabric8"
+      spec:
+        serviceAccount: elasticsearch
+        serviceAccountName: elasticsearch
+        containers:
+          - env:
+              - name: "SERVICE"
+                value: "elasticsearch-cluster"
+              - name: "KUBERNETES_NAMESPACE"
+                valueFrom:
+                  fieldRef:
+                    fieldPath: "metadata.namespace"
+              - name: "NODE_MASTER"
+                value: "false"
+            image: "fabric8/elasticsearch-k8s:2.4.0"
+            name: "elasticsearch"
+            ports:
+              - containerPort: 9300
+                name: "transport"
+            volumeMounts:
+              - mountPath: "/usr/share/elasticsearch/data"
+                name: "elasticsearch-data"
+                readOnly: false
+        volumes:
+          - emptyDir:
+              medium: ""
+            name: "elasticsearch-data"
+- apiVersion: "v1"
+  kind: "ReplicationController"
+  metadata:
+    name: "elasticsearch-master"
+  spec:
+    replicas: 1
+    selector:
+      component: "elasticsearch"
+      type: "master"
+      provider: "fabric8"
+    template:
+      metadata:
+        labels:
+          component: "elasticsearch"
+          type: "master"
+          provider: "fabric8"
+      spec:
+        serviceAccount: elasticsearch
+kind: "List"
+apiVersion: "v1"
+items:
+
+- apiVersion: v1
+  kind: ServiceAccount
+  metadata:
+    name: elasticsearch
+
+- apiVersion: "v1"
+  kind: "Service"
+  metadata:
+    name: "elasticsearch"
+  spec:
+    type: "LoadBalancer"
+    selector:
+      component: "elasticsearch"
+      type: "client"
+      provider: "fabric8"
+    ports:
+    - name: http
+      port: 9200
+      protocol: TCP
+    - name: transport
+      port: 9300
+      protocol: TCP
+    loadBalancerSourceRanges:
+    - 10.0.0.0/8
 
-```json
-{
-  "id": "elasticsearch-list",
-  "kind": "List",
-  "apiVersion": "v1beta2",
-  "name": "elasticsearch-config",
-  "description": "Configuration for elasticsearch",
-  "items": [
-    {
-      "id": "elasticsearch",
-      "apiVersion": "v1beta1",
-      "kind": "Service",
-      "containerPort": 9200,
-      "port": 9200,
-      "selector": {
-        "component": "elasticsearch",
-        "type": "client",
-        "provider": "fabric8"
-      }
-    },
-    {
-      "id": "elasticsearch-cluster",
-      "apiVersion": "v1beta1",
-      "PortalIP": "None",
-      "kind": "Service",
-      "containerPort": 9300,
-      "port": 9300,
-      "selector": {
-        "component": "elasticsearch",
-        "provider": "fabric8"
-      }
-    },
-    {
-      "id": "elasticsearch-client-rc",
-      "kind": "ReplicationController",
-      "apiVersion": "v1beta1",
-      "desiredState": {
-        "replicas": 1,
-        "replicaSelector": {
-          "component": "elasticsearch",
-          "type": "client",
-          "provider": "fabric8"
-        },
-        "podTemplate": {
-          "desiredState": {
-            "manifest": {
-              "version": "v1beta1",
-              "id": "elasticsearchPod",
-              "containers": [
-                {
-                  "name": "elasticsearch-container",
-                  "image": "fabric8/elasticsearch-k8s:1.5.0",
-                  "imagePullPolicy": "PullIfNotPresent",
-                  "env": [
-                    {
-                      "name": "SERVICE_DNS",
-                      "value": "elasticsearch-cluster"
-                    },
-                    {
-                      "name": "KUBERNETES_TRUST_CERT",
-                      "value": "true"
-                    },
-                    {
-                      "name": "NODE_DATA",
-                      "value": "false"
-                    },
-                    {
-                      "name": "NODE_MASTER",
-                      "value": "false"
-                    }
-                  ],
-                  "ports": [
-                    {
-                      "containerPort": 9200
-                    },
-                    {
-                      "containerPort": 9300
-                    }
-                  ]
-                }
-              ]
-            }
-          },
-          "labels": {
-            "component": "elasticsearch",
-            "type": "client",
-            "provider": "fabric8"
-          }
-        }
-      },
-      "labels": {
-        "component": "elasticsearch",
-        "type": "client",
-        "provider": "fabric8"
-      }
-    },
-    {
-      "id": "elasticsearch-data-rc",
-      "kind": "ReplicationController",
-      "apiVersion": "v1beta1",
-      "desiredState": {
-        "replicas": 1,
-        "replicaSelector": {
-          "component": "elasticsearch",
-          "type": "data",
-          "provider": "fabric8"
-        },
-        "podTemplate": {
-          "desiredState": {
-            "manifest": {
-              "version": "v1beta1",
-              "id": "elasticsearchPod",
-              "containers": [
-                {
-                  "name": "elasticsearch-container",
-                  "image": "fabric8/elasticsearch-k8s:1.5.0",
-                  "imagePullPolicy": "PullIfNotPresent",
-                  "env": [
-                    {
-                      "name": "SERVICE_DNS",
-                      "value": "elasticsearch-cluster"
-                    },
-                    {
-                      "name": "KUBERNETES_TRUST_CERT",
-                      "value": "true"
-                    },
-                    {
-                      "name": "NODE_MASTER",
-                      "value": "false"
-                    }
-                  ],
-                  "ports": [
-                    {
-                      "containerPort": 9300
-                    }
-                  ]
-                }
-              ]
-            }
-          },
-          "labels": {
-            "component": "elasticsearch",
-            "type": "data",
-            "provider": "fabric8"
-          }
-        }
-      },
-      "labels": {
-        "component": "elasticsearch",
-        "type": "data",
-        "provider": "fabric8"
-      }
-    },
-    {
-      "id": "elasticsearch-master-rc",
-      "kind": "ReplicationController",
-      "apiVersion": "v1beta1",
-      "desiredState": {
-        "replicas": 1,
-        "replicaSelector": {
-          "component": "elasticsearch",
-          "type": "master",
-          "provider": "fabric8"
-        },
-        "podTemplate": {
-          "desiredState": {
-            "manifest": {
-              "version": "v1beta1",
-              "id": "elasticsearchPod",
-              "containers": [
-                {
-                  "name": "elasticsearch-container",
-                  "image": "fabric8/elasticsearch-k8s:1.5.0",
-                  "imagePullPolicy": "PullIfNotPresent",
-                  "env": [
-                    {
-                      "name": "SERVICE_DNS",
-                      "value": "elasticsearch-cluster"
-                    },
-                    {
-                      "name": "KUBERNETES_TRUST_CERT",
-                      "value": "true"
-                    },
-                    {
-                      "name": "NODE_DATA",
-                      "value": "false"
-                    }
-                  ],
-                  "ports": [
-                    {
-                      "containerPort": 9300
-                    }
-                  ]
-                }
-              ]
-            }
-          },
-          "labels": {
-            "component": "elasticsearch",
-            "type": "master",
-            "provider": "fabric8"
-          }
-        }
-      },
-      "labels": {
-        "component": "elasticsearch",
-        "type": "master",
-        "provider": "fabric8"
-      }
-    }
-  ]
-}
+- apiVersion: "v1"
+  kind: "Service"
+  metadata:
+    name: "elasticsearch-cluster"
+  spec:
+    clusterIP: "None"
+    ports:
+      - port: 9300
+        targetPort: 9300
+    selector:
+      provider: "fabric8"
+      component: "elasticsearch"
+- apiVersion: "v1"
+  kind: "ReplicationController"
+  metadata:
+    name: "elasticsearch-data"
+  spec:
+    replicas: 1
+    selector:
+      component: "elasticsearch"
+      type: "data"
+      provider: "fabric8"
+    template:
+      metadata:
+        labels:
+          component: "elasticsearch"
+          type: "data"
+          provider: "fabric8"
+      spec:
+        serviceAccount: elasticsearch
+        serviceAccountName: elasticsearch
+        containers:
+          - env:
+              - name: "SERVICE_DNS"
+                value: "elasticsearch-cluster"
+              - name: "NODE_MASTER"
+                value: "false"
+            image: "fabric8/elasticsearch-k8s:1.7.6"
+            name: "elasticsearch"
+            ports:
+              - containerPort: 9300
+                name: "transport"
+            volumeMounts:
+              - mountPath: "/usr/share/elasticsearch/data"
+                name: "elasticsearch-data"
+                readOnly: false
+        volumes:
+          - emptyDir:
+              medium: ""
+            name: "elasticsearch-data"
+- apiVersion: "v1"
+  kind: "ReplicationController"
+  metadata:
+    name: "elasticsearch-master"
+  spec:
+    replicas: 1
+    selector:
+      component: "elasticsearch"
+      type: "master"
+      provider: "fabric8"
+    template:
+      metadata:
+        labels:
+          component: "elasticsearch"
+          type: "master"
+          provider: "fabric8"
+      spec:
+        serviceAccount: elasticsearch
+        serviceAccountName: elasticsearch
+        containers:
+          - env:
+              - name: "SERVICE_DNS"
+                value: "elasticsearch-cluster"
+              - name: "NODE_DATA"
+                value: "false"
+            image: "fabric8/elasticsearch-k8s:1.7.6"
+            name: "elasticsearch"
+            ports:
+              - containerPort: 9300
+                name: "transport"
+- apiVersion: "v1"
+  kind: "ReplicationController"
+  metadata:
+    name: "elasticsearch-client"
+  spec:
+    replicas: 1
+    selector:
+      component: "elasticsearch"
+      type: "client"
+      provider: "fabric8"
+    template:
+      metadata:
+        labels:
+          component: "elasticsearch"
+          type: "client"
+          provider: "fabric8"
+      spec:
+        serviceAccount: elasticsearch
+        serviceAccountName: elasticsearch
+        containers:
+          - env:
+              - name: "SERVICE_DNS"
+                value: "elasticsearch-cluster"
+              - name: "NODE_DATA"
+                value: "false"
+              - name: "NODE_MASTER"
+                value: "false"
+            image: "fabric8/elasticsearch-k8s:1.7.6"
+            name: "elasticsearch"
+            ports:
+              - containerPort: 9200
+                name: "http"
+              - containerPort: 9300
+                name: "transport"
 ```
diff --git a/elasticsearch.yml b/elasticsearch.yml
index 13d4675..ec911fe 100644
--- a/elasticsearch.yml
+++ b/elasticsearch.yml
@@ -1,6 +1,24 @@
+#
+# Copyright (C) 2015 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 node.data: ${NODE_DATA}
 node.master: ${NODE_MASTER}
 
+network.host: 0.0.0.0
+
 cloud:
   k8s:
     servicedns: ${SERVICE_DNS}
diff --git a/header.txt b/header.txt
new file mode 100644
index 0000000..12de4d4
--- /dev/null
+++ b/header.txt
@@ -0,0 +1,13 @@
+Copyright (C) ${project.inceptionYear} ${owner}
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/kubernetes.yml b/kubernetes.yml
new file mode 100644
index 0000000..4dc02fb
--- /dev/null
+++ b/kubernetes.yml
@@ -0,0 +1,141 @@
+kind: "List"
+apiVersion: "v1"
+items:
+
+- apiVersion: v1
+  kind: ServiceAccount
+  metadata:
+    name: elasticsearch
+
+- apiVersion: "v1"
+  kind: "Service"
+  metadata:
+    name: "elasticsearch"
+  spec:
+    type: "LoadBalancer"
+    selector:
+      component: "elasticsearch"
+      type: "client"
+      provider: "fabric8"
+    ports:
+    - name: http
+      port: 9200
+      protocol: TCP
+    - name: transport
+      port: 9300
+      protocol: TCP
+
+- apiVersion: "v1"
+  kind: "Service"
+  metadata:
+    name: "elasticsearch-cluster"
+  spec:
+    clusterIP: "None"
+    ports:
+      - port: 9300
+        targetPort: 9300
+    selector:
+      provider: "fabric8"
+      component: "elasticsearch"
+- apiVersion: "v1"
+  kind: "ReplicationController"
+  metadata:
+    name: "elasticsearch-data"
+  spec:
+    replicas: 1
+    selector:
+      component: "elasticsearch"
+      type: "data"
+      provider: "fabric8"
+    template:
+      metadata:
+        labels:
+          component: "elasticsearch"
+          type: "data"
+          provider: "fabric8"
+      spec:
+        serviceAccount: elasticsearch
+        serviceAccountName: elasticsearch
+        containers:
+          - env:
+              - name: "SERVICE_DNS"
+                value: "elasticsearch-cluster"
+              - name: "NODE_MASTER"
+                value: "false"
+            image: "fabric8/elasticsearch-k8s:1.7.6"
+            name: "elasticsearch"
+            ports:
+              - containerPort: 9300
+                name: "transport"
+            volumeMounts:
+              - mountPath: "/usr/share/elasticsearch/data"
+                name: "elasticsearch-data"
+                readOnly: false
+        volumes:
+          - emptyDir:
+              medium: ""
+            name: "elasticsearch-data"
+- apiVersion: "v1"
+  kind: "ReplicationController"
+  metadata:
+    name: "elasticsearch-master"
+  spec:
+    replicas: 1
+    selector:
+      component: "elasticsearch"
+      type: "master"
+      provider: "fabric8"
+    template:
+      metadata:
+        labels:
+          component: "elasticsearch"
+          type: "master"
+          provider: "fabric8"
+      spec:
+        serviceAccount: elasticsearch
+        serviceAccountName: elasticsearch
+        containers:
+          - env:
+              - name: "SERVICE_DNS"
+                value: "elasticsearch-cluster"
+              - name: "NODE_DATA"
+                value: "false"
+            image: "fabric8/elasticsearch-k8s:1.7.6"
+            name: "elasticsearch"
+            ports:
+              - containerPort: 9300
+                name: "transport"
+- apiVersion: "v1"
+  kind: "ReplicationController"
+  metadata:
+    name: "elasticsearch-client"
+  spec:
+    replicas: 1
+    selector:
+      component: "elasticsearch"
+      type: "client"
+      provider: "fabric8"
+    template:
+      metadata:
+        labels:
+          component: "elasticsearch"
+          type: "client"
+          provider: "fabric8"
+      spec:
+        serviceAccount: elasticsearch
+        serviceAccountName: elasticsearch
+        containers:
+          - env:
+              - name: "SERVICE_DNS"
+                value: "elasticsearch-cluster"
+              - name: "NODE_DATA"
+                value: "false"
+              - name: "NODE_MASTER"
+                value: "false"
+            image: "fabric8/elasticsearch-k8s:1.7.6"
+            name: "elasticsearch"
+            ports:
+              - containerPort: 9200
+                name: "http"
+              - containerPort: 9300
+                name: "transport"
diff --git a/pom.xml b/pom.xml
index b3aba40..60e974e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,358 +1,306 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed to Elasticsearch under one or more contributor
-license agreements. See the NOTICE file distributed with this work for additional
-information regarding copyright ownership. Elasticsearch licenses this file to you
-under the Apache License, Version 2.0 (the "License"); you may not use this
-file except in compliance with the License. You may obtain a copy of the
-License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by
-applicable law or agreed to in writing, software distributed under the License
-is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the specific language
-governing permissions and limitations under the License. -->
+<!--
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>io.fabric8</groupId>
-  <artifactId>elasticsearch-cloud-kubernetes</artifactId>
-  <version>1.3.0</version>
+    Copyright (C) 2015 Red Hat, Inc.
 
-  <name>Elasticsearch Kubernetes cloud plugin</name>
-  <description>The Kubernetes Cloud plugin allows to use Kubernetes for the unicast discovery mechanism.</description>
-  <url>https://github.com/jimmidyson/elasticsearch-cloud-kubernetes/</url>
-  <inceptionYear>2013</inceptionYear>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
 
-  <parent>
-    <groupId>org.sonatype.oss</groupId>
-    <artifactId>oss-parent</artifactId>
-    <version>9</version>
-  </parent>
+            http://www.apache.org/licenses/LICENSE-2.0
 
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <scm>
-    <connection>scm:git:git@github.com:fabric8io/elasticsearch-cloud-kubernetes.git</connection>
-    <developerConnection>scm:git:git@github.com:fabric8io/elasticsearch-cloud-kubernetes.git</developerConnection>
-    <url>http://github.com/fabric8io/elasticsearch-cloud-kubernetes</url>
-    <tag>elasticsearch-cloud-kubernetes-1.3.0</tag>
-  </scm>
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 
-  <issueManagement>
-    <system>GitHub</system>
-    <url>https://github.com/fabric8io/elasticsearch-cloud-kubernetes/issues/</url>
-  </issueManagement>
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>io.fabric8</groupId>
+    <artifactId>elasticsearch-cloud-kubernetes</artifactId>
+    <version>1.7.6-SNAPSHOT</version>
 
-  <properties>
-    <elasticsearch.version>1.6.0</elasticsearch.version>
-    <fabric8.version>2.2.4</fabric8.version>
-    <lucene.version>4.10.4</lucene.version>
-    <tests.shuffle>true</tests.shuffle>
-    <tests.output>onerror</tests.output>
-    <tests.client.ratio />
-    <es.plugin.port>9300</es.plugin.port>
-    <es.logger.level>INFO</es.logger.level>
-    <es.config>${project.build.testOutputDirectory}/elasticsearch.yml</es.config>
-  </properties>
+    <name>Elasticsearch Kubernetes cloud plugin</name>
+    <description>The Kubernetes Cloud plugin allows to use Kubernetes for the unicast discovery mechanism.</description>
+    <url>https://github.com/jimmidyson/elasticsearch-cloud-kubernetes/</url>
+    <inceptionYear>2015</inceptionYear>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-core</artifactId>
-      <version>1.3.RC2</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-library</artifactId>
-      <version>1.3.RC2</version>
-      <scope>test</scope>
-    </dependency>
+    <parent>
+        <groupId>org.sonatype.oss</groupId>
+        <artifactId>oss-parent</artifactId>
+        <version>9</version>
+    </parent>
 
-    <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-test-framework</artifactId>
-      <version>${lucene.version}</version>
-      <scope>test</scope>
-    </dependency>
+    <licenses>
+        <license>
+            <name>The Apache Software License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+    <scm>
+        <connection>scm:git:git@github.com:fabric8io/elasticsearch-cloud-kubernetes.git</connection>
+        <developerConnection>scm:git:git@github.com:fabric8io/elasticsearch-cloud-kubernetes.git</developerConnection>
+        <url>http://github.com/fabric8io/elasticsearch-cloud-kubernetes</url>
+    </scm>
 
-    <!-- Elasticsearch -->
-    <dependency>
-      <groupId>org.elasticsearch</groupId>
-      <artifactId>elasticsearch</artifactId>
-      <version>${elasticsearch.version}</version>
-    </dependency>
+    <issueManagement>
+        <system>GitHub</system>
+        <url>https://github.com/fabric8io/elasticsearch-cloud-kubernetes/issues/</url>
+    </issueManagement>
 
-    <!-- Fabric8 Kubernetes APIs -->
-    <dependency>
-      <groupId>io.fabric8</groupId>
-      <artifactId>kubernetes-api</artifactId>
-      <version>${fabric8.version}</version>
-    </dependency>
+    <properties>
+        <fabric8.version>2.2.4</fabric8.version>
+        <elasticsearch.plugin.name>cloud-kubernetes</elasticsearch.plugin.name>
+        <elasticsearch.version>1.7.6</elasticsearch.version>
+        <kubernetes-client.version>1.3.83</kubernetes-client.version>
+        <lucene.version>5.5.2</lucene.version>
+        <tests.shuffle>true</tests.shuffle>
+        <tests.output>onerror</tests.output>
+        <tests.client.ratio/>
+        <es.plugin.port>9300</es.plugin.port>
+        <es.logger.level>INFO</es.logger.level>
+        <es.config>${project.build.testOutputDirectory}/elasticsearch.yml</es.config>
+    </properties>
 
-    <!-- Logging -->
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <version>1.7.7</version>
-    </dependency>
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+        </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-core</artifactId>
+            <version>1.3.RC2</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-library</artifactId>
+            <version>1.3.RC2</version>
+            <scope>test</scope>
+        </dependency>
 
-    <!-- Tests -->
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.17</version>
-      <scope>test</scope>
-    </dependency>
+        <dependency>
+            <groupId>org.apache.lucene</groupId>
+            <artifactId>lucene-test-framework</artifactId>
+            <version>${lucene.version}</version>
+            <scope>test</scope>
+        </dependency>
 
-    <dependency>
-      <groupId>org.elasticsearch</groupId>
-      <artifactId>elasticsearch</artifactId>
-      <version>${elasticsearch.version}</version>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
+        <!-- Elasticsearch -->
+        <dependency>
+            <groupId>org.elasticsearch</groupId>
+            <artifactId>elasticsearch</artifactId>
+            <version>${elasticsearch.version}</version>
+        </dependency>
 
-  </dependencies>
+        <!-- Fix Jackson incompatibility -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.5.3</version>
+        </dependency>
 
-  <build>
-    <extensions>
-      <extension>
-        <groupId>org.kuali.maven.wagons</groupId>
-        <artifactId>maven-s3-wagon</artifactId>
-        <version>1.1.19</version>
-      </extension>
-    </extensions>
+        <!-- Fabric8 Kubernetes APIs -->
+        <dependency>
+            <groupId>io.fabric8</groupId>
+            <artifactId>kubernetes-api</artifactId>
+            <version>${fabric8.version}</version>
+        </dependency>
 
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-        <filtering>true</filtering>
-      </resource>
-    </resources>
-    <testResources>
-      <testResource>
-        <directory>src/test/resources</directory>
-        <filtering>true</filtering>
-        <includes>
-          <include>plugin-test.properties</include>
-          <include>elasticsearch.yml</include>
-        </includes>
-      </testResource>
-      <testResource>
-        <directory>src/test/resources</directory>
-        <filtering>false</filtering>
-        <includes>
-          <include>log4j.xml</include>
-        </includes>
-      </testResource>
-    </testResources>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.1</version>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>com.carrotsearch.randomizedtesting</groupId>
-        <artifactId>junit4-maven-plugin</artifactId>
-        <version>2.0.14</version>
-        <executions>
-          <execution>
-            <id>tests</id>
-            <phase>test</phase>
-            <goals>
-              <goal>junit4</goal>
-            </goals>
-            <configuration>
-              <heartbeat>20</heartbeat>
-              <jvmOutputAction>pipe,warn</jvmOutputAction>
-              <leaveTemporary>true</leaveTemporary>
-              <listeners>
-                <report-ant-xml mavenExtensions="true" dir="${project.build.directory}/surefire-reports" />
-                <report-text showThrowable="true" showStackTraces="true" showOutput="${tests.output}" showStatusOk="false" showStatusError="true" showStatusFailure="true" showStatusIgnored="true" showSuiteSummary="true" timestamps="false" />
-                <report-execution-times file="${basedir}/.local-execution-hints.log" />
-              </listeners>
-              <assertions>
-                <enable />
-              </assertions>
-              <parallelism>1</parallelism>
-              <balancers>
-                <execution-times>
-                  <fileset dir="${basedir}" includes=".local-execution-hints.log" />
-                </execution-times>
-              </balancers>
-              <includes>
-                <include>**/*Tests.class</include>
-                <include>**/*Test.class</include>
-              </includes>
-              <excludes>
-                <exclude>**/Abstract*.class</exclude>
-                <exclude>**/*StressTest.class</exclude>
-              </excludes>
-              <argLine>
-                ${tests.jvm.argline}
-              </argLine>
-              <jvmArgs>
-                <param>-Xmx512m</param>
-                <param>-Xss256k</param>
-                <param>-XX:MaxDirectMemorySize=512m</param>
-                <param>-Des.logger.prefix=</param>
-              </jvmArgs>
-              <shuffleOnSlave>${tests.shuffle}</shuffleOnSlave>
-              <sysouts>${tests.verbose}</sysouts>
-              <seed>${tests.seed}</seed>
-              <haltOnFailure>${tests.failfast}</haltOnFailure>
-              <systemProperties>
-                <!-- RandomizedTesting library system properties -->
-                <tests.jvm.argline>${tests.jvm.argline}</tests.jvm.argline>
-                <tests.iters>${tests.iters}</tests.iters>
-                <tests.maxfailures>${tests.maxfailures}</tests.maxfailures>
-                <tests.failfast>${tests.failfast}</tests.failfast>
-                <tests.class>${tests.class}</tests.class>
-                <tests.method>${tests.method}</tests.method>
-                <tests.nightly>${tests.nightly}</tests.nightly>
-                <tests.badapples>${tests.badapples}</tests.badapples>
-                <tests.weekly>${tests.weekly}</tests.weekly>
-                <tests.slow>${tests.slow}</tests.slow>
-                <tests.k8s>${tests.k8s}</tests.k8s>
-                <tests.config>${tests.config}</tests.config>
-                <tests.awaitsfix>${tests.awaitsfix}</tests.awaitsfix>
-                <tests.slow>${tests.slow}</tests.slow>
-                <tests.timeoutSuite>${tests.timeoutSuite}</tests.timeoutSuite>
-                <tests.showSuccess>${tests.showSuccess}</tests.showSuccess>
-                <tests.integration>${tests.integration}</tests.integration>
-                <tests.cluster_seed>${tests.cluster_seed}</tests.cluster_seed>
-                <tests.client.ratio>${tests.client.ratio}</tests.client.ratio>
-                <es.node.local>false</es.node.local>
-                <es.node.mode>network</es.node.mode>
-                <es.logger.level>${es.logger.level}</es.logger.level>
-                <java.awt.headless>true</java.awt.headless>
-              </systemProperties>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.15</version>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-source-plugin</artifactId>
-        <version>2.2.1</version>
-        <executions>
-          <execution>
-            <id>attach-sources</id>
-            <goals>
-              <goal>jar</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.4</version>
-        <configuration>
-          <appendAssemblyId>false</appendAssemblyId>
-          <outputDirectory>${project.build.directory}/releases/</outputDirectory>
-          <descriptors>
-            <descriptor>${basedir}/src/main/assemblies/plugin.xml</descriptor>
-          </descriptors>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.jolokia</groupId>
-        <artifactId>docker-maven-plugin</artifactId>
-        <version>0.12.0</version>
-        <configuration>
-          <images>
-            <image>
-              <name>docker.io/fabric8/elasticsearch-k8s:${elasticsearch.version}</name>
-              <build>
-                <from>elasticsearch:${elasticsearch.version}</from>
-                <assembly>
-                  <descriptor>${basedir}/src/main/assemblies/docker-image.xml</descriptor>
-                  <basedir>/usr/share/elasticsearch/</basedir>
-                </assembly>
-                <env>
-                  <NODE_DATA>true</NODE_DATA>
-                  <NODE_MASTER>true</NODE_MASTER>
-                </env>
-              </build>
-            </image>
-          </images>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-release-plugin</artifactId>
-        <version>2.5</version>
-        <configuration>
-          <releaseProfiles>docker-push</releaseProfiles>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <profiles>
-    <profile>
-      <id>docker-push</id>
-      <build>
+        <!-- Fabric8 Kubernetes APIs -->
+        <dependency>
+            <groupId>io.fabric8</groupId>
+            <artifactId>kubernetes-client</artifactId>
+            <version>${kubernetes-client.version}</version>
+        </dependency>
+
+        <!-- Logging -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>1.7.7</version>
+        </dependency>
+
+        <!-- Tests -->
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.17</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.elasticsearch</groupId>
+            <artifactId>elasticsearch</artifactId>
+            <version>${elasticsearch.version}</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <extensions>
+            <extension>
+                <groupId>org.kuali.maven.wagons</groupId>
+                <artifactId>maven-s3-wagon</artifactId>
+                <version>1.1.19</version>
+            </extension>
+        </extensions>
+
+        <resources>
+            <resource>
+                <directory>src/main/plugin-metadata</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <testResources>
+            <testResource>
+                <directory>src/test/resources</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>plugin-test.properties</include>
+                    <include>elasticsearch.yml</include>
+                </includes>
+            </testResource>
+            <testResource>
+                <directory>src/test/resources</directory>
+                <filtering>false</filtering>
+                <includes>
+                    <include>log4j.xml</include>
+                </includes>
+            </testResource>
+        </testResources>
         <plugins>
-          <plugin>
-            <groupId>org.jolokia</groupId>
-            <artifactId>docker-maven-plugin</artifactId>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>build</goal>
-                </goals>
-                <phase>package</phase>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>exec-maven-plugin</artifactId>
-            <version>1.4.0</version>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>exec</goal>
-                </goals>
-                <phase>package</phase>
-              </execution>
-            </executions>
-            <configuration>
-              <executable>docker</executable>
-              <arguments>
-                <argument>push</argument>
-                <argument>-f</argument>
-                <argument>docker.io/fabric8/elasticsearch-k8s:${elasticsearch.version}</argument>
-              </arguments>
-            </configuration>
-          </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.15</version>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>2.2.1</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.4</version>
+                <configuration>
+                    <appendAssemblyId>false</appendAssemblyId>
+                    <outputDirectory>${project.build.directory}/releases/</outputDirectory>
+                    <descriptors>
+                        <descriptor>${basedir}/src/main/assemblies/plugin.xml</descriptor>
+                    </descriptors>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>io.fabric8</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
+                <version>0.15.7</version>
+                <configuration>
+                    <images>
+                        <image>
+                            <name>fabric8/elasticsearch:${elasticsearch.version}</name>
+                            <build>
+                                <dockerFileDir>${project.basedir}/src/main/docker</dockerFileDir>
+                            </build>
+                        </image>
+                        <image>
+                            <name>fabric8/elasticsearch-k8s:${elasticsearch.version}</name>
+                            <build>
+                                <from>fabric8/elasticsearch:${elasticsearch.version}</from>
+                                <assembly>
+                                    <descriptor>${basedir}/src/main/assemblies/docker-image.xml</descriptor>
+                                    <basedir>/usr/share/elasticsearch/</basedir>
+                                </assembly>
+                                <env>
+                                    <NODE_DATA>true</NODE_DATA>
+                                    <NODE_MASTER>true</NODE_MASTER>
+                                    <JAVA_OPTS>-Djava.net.preferIPv4Stack=true</JAVA_OPTS>
+                                </env>
+                            </build>
+                        </image>
+                    </images>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-release-plugin</artifactId>
+                <version>2.5</version>
+                <configuration>
+                    <releaseProfiles>docker-deploy</releaseProfiles>
+                    <goals>deploy docker:build docker:push</goals>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>com.mycila</groupId>
+                <artifactId>license-maven-plugin</artifactId>
+                <version>2.11</version>
+                <configuration>
+                    <aggregate>true</aggregate>
+                    <header>header.txt</header>
+                    <properties>
+                        <owner>Red Hat, Inc.</owner>
+                    </properties>
+                    <excludes>
+                        <exclude>.editorconfig</exclude>
+                        <exclude>license.txt</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
         </plugins>
-      </build>
-    </profile>
-  </profiles>
+    </build>
+    <!--
+    Default sample commands:
+    mvn -Pdocker-build         ... build Docker images
+    mvn -Pdocker-deploy        ... docker-build + push to Docker registry
+    -->
+    <profiles>
+        <profile>
+            <id>docker-build</id>
+            <build>
+                <defaultGoal>clean install docker:build</defaultGoal>
+            </build>
+        </profile>
+        <profile>
+            <id>docker-deploy</id>
+            <build>
+                <defaultGoal>clean install docker:build docker:push</defaultGoal>
+            </build>
+        </profile>
+    </profiles>
 </project>
diff --git a/resources/es-plugin.properties b/resources/es-plugin.properties
new file mode 100644
index 0000000..028a92e
--- /dev/null
+++ b/resources/es-plugin.properties
@@ -0,0 +1,2 @@
+plugin=io.fabric8.elasticsearch.plugin.cloud.k8s.CloudK8sPlugin
+version=${project.version}
diff --git a/src/main/assemblies/plugin.xml b/src/main/assemblies/plugin.xml
index 634831c..a290915 100644
--- a/src/main/assemblies/plugin.xml
+++ b/src/main/assemblies/plugin.xml
@@ -1,21 +1,39 @@
 <?xml version="1.0"?>
-<!-- Licensed to ElasticSearch under one or more contributor
-license agreements. See the NOTICE file distributed with this work for additional
-information regarding copyright ownership. ElasticSearch licenses this file to you
-under the Apache License, Version 2.0 (the "License"); you may not use this
-file except in compliance with the License. You may obtain a copy of the
-License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by
-applicable law or agreed to in writing, software distributed under the License
-is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the specific language
-governing permissions and limitations under the License. -->
+<!--
 
+    Copyright (C) 2015 Red Hat, Inc.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+            http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
 <assembly>
     <id>plugin</id>
     <formats>
         <format>zip</format>
     </formats>
     <includeBaseDirectory>false</includeBaseDirectory>
+    <files>
+        <file>
+            <source>${basedir}/src/main/plugin-metadata/plugin-security.policy</source>
+            <outputDirectory></outputDirectory>
+            <filtered>false</filtered>
+        </file>
+        <file>
+            <source>${basedir}/src/main/plugin-metadata/plugin-descriptor.properties</source>
+            <outputDirectory></outputDirectory>
+            <filtered>true</filtered>
+        </file>
+    </files>
     <dependencySets>
         <dependencySet>
             <outputDirectory>/</outputDirectory>
diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
new file mode 100644
index 0000000..d343e28
--- /dev/null
+++ b/src/main/docker/Dockerfile
@@ -0,0 +1 @@
+FROM elasticsearch:1.7.6
\ No newline at end of file
diff --git a/src/main/docker/config/elasticsearch.yml b/src/main/docker/config/elasticsearch.yml
new file mode 100644
index 0000000..2644bc7
--- /dev/null
+++ b/src/main/docker/config/elasticsearch.yml
@@ -0,0 +1,17 @@
+#
+# Copyright (C) 2015 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+network.host: 0.0.0.0
diff --git a/src/main/docker/config/logging.yml b/src/main/docker/config/logging.yml
new file mode 100644
index 0000000..3046ddb
--- /dev/null
+++ b/src/main/docker/config/logging.yml
@@ -0,0 +1,31 @@
+#
+# Copyright (C) 2015 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# you can override this using by setting a system property, for example -Des.logger.level=DEBUG
+es.logger.level: INFO
+rootLogger: ${es.logger.level}, console
+logger:
+  # log action execution errors for easier debugging
+  action: DEBUG
+  # reduce the logging for aws, too much is logged under the default INFO
+  com.amazonaws: WARN
+
+appender:
+  console:
+    type: console
+    layout:
+      type: consolePattern
+      conversionPattern: "[%d{ISO8601}][%-5p][%-25c] %m%n"
diff --git a/src/main/java/io/fabric8/elasticsearch/discovery/k8s/K8sUnicastHostsProvider.java b/src/main/java/io/fabric8/elasticsearch/discovery/k8s/K8sUnicastHostsProvider.java
index 1cba70a..26b41ba 100644
--- a/src/main/java/io/fabric8/elasticsearch/discovery/k8s/K8sUnicastHostsProvider.java
+++ b/src/main/java/io/fabric8/elasticsearch/discovery/k8s/K8sUnicastHostsProvider.java
@@ -51,8 +51,8 @@ static final public class Fields {
 
     @Inject
     public K8sUnicastHostsProvider(Settings settings,
-            TransportService transportService,
-            NetworkService networkService) {
+                                   TransportService transportService,
+                                   NetworkService networkService) {
         super(settings);
         this.transportService = transportService;
         this.networkService = networkService;
diff --git a/src/main/plugin-metadata/plugin-descriptor.properties b/src/main/plugin-metadata/plugin-descriptor.properties
new file mode 100644
index 0000000..c0ac594
--- /dev/null
+++ b/src/main/plugin-metadata/plugin-descriptor.properties
@@ -0,0 +1,23 @@
+#
+# Copyright (C) 2015 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+name=${elasticsearch.plugin.name}
+version=${project.version}
+jvm=true
+classname=io.fabric8.elasticsearch.plugin.discovery.kubernetes.KubernetesDiscoveryPlugin
+description=${project.name}
+elasticsearch.version=${elasticsearch.version}
+java.version=1.8
diff --git a/src/main/plugin-metadata/plugin-security.policy b/src/main/plugin-metadata/plugin-security.policy
new file mode 100644
index 0000000..f57cea6
--- /dev/null
+++ b/src/main/plugin-metadata/plugin-security.policy
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2015 Red Hat, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+grant {
+  permission java.lang.RuntimePermission "accessDeclaredMembers";
+  permission java.lang.RuntimePermission "setFactory";
+  permission java.lang.reflect.ReflectPermission "suppressAccessChecksv";
+  permission java.io.FilePermission "<<ALL FILES>>", "read,execute,readlink";
+  permission java.net.NetPermission "getProxySelector";
+  permission java.net.NetPermission "getCookieHandler";
+};
diff --git a/src/test/java/io/fabric8/cloud/k8s/AbstractK8sTest.java b/src/test/java/io/fabric8/cloud/k8s/AbstractK8sTest.java
index ee1f061..352d9f9 100644
--- a/src/test/java/io/fabric8/cloud/k8s/AbstractK8sTest.java
+++ b/src/test/java/io/fabric8/cloud/k8s/AbstractK8sTest.java
@@ -8,6 +8,7 @@
 import org.elasticsearch.env.FailedToResolveConfigException;
 import org.elasticsearch.plugins.PluginsService;
 import org.elasticsearch.test.ElasticsearchIntegrationTest;
+import org.junit.Assert;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Inherited;
@@ -23,7 +24,7 @@ public abstract class AbstractK8sTest extends ElasticsearchIntegrationTest {
      * Annotation for tests that require GCE to run. GCE tests are disabled by default.
      * See README file for details.
      */
-   @Documented
+    @Documented
     @Inherited
     @Retention(RetentionPolicy.RUNTIME)
     @TestGroup(enabled = false, sysProperty = SYSPROP_K8S)
@@ -47,10 +48,10 @@ protected Settings nodeSettings(int nodeOrdinal) {
             if (Strings.hasText(System.getProperty("tests.config"))) {
                 settings.loadFromUrl(environment.resolveConfig(System.getProperty("tests.config")));
             } else {
-                fail("to run integration tests, you need to set -Dtest.k8s=true and -Dtests.config=/path/to/elasticsearch.yml");
+                Assert.fail("to run integration tests, you need to set -Dtest.k8s=true and -Dtests.config=/path/to/elasticsearch.yml");
             }
         } catch (FailedToResolveConfigException exception) {
-            fail("your test configuration file is incorrect: " + System.getProperty("tests.config"));
+            Assert.fail("your test configuration file is incorrect: " + System.getProperty("tests.config"));
         }
         return settings.build();
     }
diff --git a/src/test/java/io/fabric8/k8s/itest/K8sSimpleITest.java b/src/test/java/io/fabric8/k8s/itest/K8sSimpleITest.java
index ad4763b..6e2a3f6 100644
--- a/src/test/java/io/fabric8/k8s/itest/K8sSimpleITest.java
+++ b/src/test/java/io/fabric8/k8s/itest/K8sSimpleITest.java
@@ -7,6 +7,7 @@
 import org.elasticsearch.plugins.PluginsService;
 import org.elasticsearch.test.ElasticsearchIntegrationTest;
 import org.hamcrest.Matchers;
+import org.junit.Assert;
 import org.junit.Test;
 
 @AbstractK8sTest.K8sTest
@@ -32,7 +33,7 @@ public void one_node_should_run() {
 
         System.out.println(clusterState.getState().getNodes().getSize());
 
-        assertThat(clusterState.getState().getNodes().getSize(), Matchers.greaterThanOrEqualTo(2));
+        Assert.assertThat(clusterState.getState().getNodes().getSize(), Matchers.greaterThanOrEqualTo(2));
     }
 
     @Override