diff --git a/stable/kube2iam/Chart.yaml b/stable/kube2iam/Chart.yaml
index 92abd49ca149..2084cd0e816e 100644
--- a/stable/kube2iam/Chart.yaml
+++ b/stable/kube2iam/Chart.yaml
@@ -1,5 +1,5 @@
 name: kube2iam
-version: 0.8.4
+version: 0.8.5
 appVersion: 0.10.0
 description: Provide IAM credentials to pods based on annotations.
 keywords:
@@ -11,10 +11,10 @@ home: https://github.com/jtblin/kube2iam
 sources:
 - https://github.com/jtblin/kube2iam
 maintainers:
-- name: Josh Carp
+- name: jmcarp
   email: jm.carp@gmail.com
-- name: Michael Haselton
+- name: icereval
   email: michael.haselton@gmail.com
-- name: Michael Goodness
+- name: mgoodness
   email: mgoodness@gmail.com
 engine: gotpl
diff --git a/stable/kube2iam/templates/daemonset.yaml b/stable/kube2iam/templates/daemonset.yaml
index 76a2e64ebf6b..496091386df1 100644
--- a/stable/kube2iam/templates/daemonset.yaml
+++ b/stable/kube2iam/templates/daemonset.yaml
@@ -93,7 +93,7 @@ spec:
       serviceAccountName: {{ if .Values.rbac.create }}{{ template "kube2iam.fullname" . }}{{ else }}"{{ .Values.rbac.serviceAccountName }}"{{ end }}
       tolerations:
 {{ toYaml .Values.tolerations | indent 8 }}
-{{- if and (eq .Capabilities.KubeVersion.Major "1") (gt .Capabilities.KubeVersion.Minor "5") }}
+{{- if semverCompare "^1.6-0" .Capabilities.KubeVersion.GitVersion }}
   updateStrategy:
     type: {{ .Values.updateStrategy }}
 {{- end }}