diff --git a/stable/chaoskube/Chart.yaml b/stable/chaoskube/Chart.yaml
index 792a080be1..5980f35b65 100755
--- a/stable/chaoskube/Chart.yaml
+++ b/stable/chaoskube/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: chaoskube
-version: 0.14.0
+version: 1.0.0
 appVersion: 0.12.1
 description: Chaoskube periodically kills random pods in your Kubernetes cluster.
 icon: https://raw.githubusercontent.com/linki/chaoskube/master/chaoskube.png
diff --git a/stable/chaoskube/README.md b/stable/chaoskube/README.md
index a2f24a4abb..2d745c24c8 100644
--- a/stable/chaoskube/README.md
+++ b/stable/chaoskube/README.md
@@ -63,6 +63,7 @@ $ helm install stable/chaoskube --set dryRun=false
 | `minimumAge`              | Set minimum pod age to filter pod by                | `0s`                             |
 | `podAnnotations`          | Annotations for the chaoskube pod                   | `{}`                             |
 | `gracePeriod`             | grace period to give pods when terminating them     | `-1s` (pod decides)              |
+| `metricsAddress`          | Listening address for metrics handler               | `:8080`                          |
 
 Setting label and namespaces selectors from the shell can be tricky but is possible (example with zsh):
 
diff --git a/stable/chaoskube/templates/deployment.yaml b/stable/chaoskube/templates/deployment.yaml
index 8e3e71f1fb..c57eb8b680 100644
--- a/stable/chaoskube/templates/deployment.yaml
+++ b/stable/chaoskube/templates/deployment.yaml
@@ -18,6 +18,10 @@ spec:
     metadata:
       labels:
 {{ include "labels.standard" . | indent 8 }}
+    {{- if .Values.podAnnotations }}
+      annotations:
+{{ toYaml .Values.podAnnotations | indent 8 }}
+    {{- end }}
     spec:
       containers:
         - name: {{ .Values.name }}
@@ -39,6 +43,7 @@ spec:
             {{- end }}
             - --minimum-age={{ .Values.minimumAge }}
             - --grace-period={{ .Values.gracePeriod }}
+            - --metrics-address={{ .Values.metricsAddress }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
           securityContext:
diff --git a/stable/chaoskube/values.yaml b/stable/chaoskube/values.yaml
index fb0fe59e6b..b609896be4 100644
--- a/stable/chaoskube/values.yaml
+++ b/stable/chaoskube/values.yaml
@@ -46,6 +46,9 @@ minimumAge: 0s
 # grace period to give pods when terminating them (negative: pod decides)
 gracePeriod: -1s
 
+# Listening address for metrics handler
+metricsAddress: :8080
+
 priorityClassName: ""
 
 # create service account with permission to list and kill pods