diff --git a/stable/kube2iam/Chart.yaml b/stable/kube2iam/Chart.yaml
index a96350556b..92dded4caf 100644
--- a/stable/kube2iam/Chart.yaml
+++ b/stable/kube2iam/Chart.yaml
@@ -1,5 +1,5 @@
 name: kube2iam
-version: 0.8.7
+version: 0.9.0
 appVersion: 0.10.0
 description: Provide IAM credentials to pods based on annotations.
 keywords:
diff --git a/stable/kube2iam/templates/daemonset.yaml b/stable/kube2iam/templates/daemonset.yaml
index b6d6364006..40a305a928 100644
--- a/stable/kube2iam/templates/daemonset.yaml
+++ b/stable/kube2iam/templates/daemonset.yaml
@@ -27,6 +27,7 @@ spec:
           imagePullPolicy: "{{ .Values.image.pullPolicy }}"
           args:
             - --host-interface={{ .Values.host.interface }}
+            - --node=$(NODE_NAME)
           {{- if .Values.host.iptables }}
             - --host-ip={{ .Values.host.ip }}
           {{- end }}
@@ -47,6 +48,10 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: status.podIP
+            - name: NODE_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: spec.nodeName
           {{- if and .Values.aws.secret_key .Values.aws.access_key }}
             - name: AWS_ACCESS_KEY_ID
               valueFrom: