diff --git a/stable/aws-cloudwatch-metrics/Chart.yaml b/stable/aws-cloudwatch-metrics/Chart.yaml
index 41dc7640c..812742bf7 100644
--- a/stable/aws-cloudwatch-metrics/Chart.yaml
+++ b/stable/aws-cloudwatch-metrics/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: aws-cloudwatch-metrics
 description: A Helm chart to deploy aws-cloudwatch-metrics project
-version: 0.0.5
+version: 0.0.6
 appVersion: "1.247345"
 home: https://github.com/aws/eks-charts
 icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
diff --git a/stable/aws-cloudwatch-metrics/README.md b/stable/aws-cloudwatch-metrics/README.md
index 00109863a..20a23663e 100755
--- a/stable/aws-cloudwatch-metrics/README.md
+++ b/stable/aws-cloudwatch-metrics/README.md
@@ -29,3 +29,6 @@ helm upgrade --install aws-cloudwatch-metrics \
 | `serviceAccount.create` | Whether a new service account should be created | `true` | 
 | `serviceAccount.name` | Service account to be used | | 
 | `hostNetwork` | Allow to use the network namespace and network resources of the node | `false` | 
+| `nodeSelector` | Node labels for pod assignment	 | {} | 
+| `tolerations` | Optional deployment tolerations	 | {} | 
+| `annotations` | Optional pod annotations	 | {} | 
diff --git a/stable/aws-cloudwatch-metrics/templates/daemonset.yaml b/stable/aws-cloudwatch-metrics/templates/daemonset.yaml
index 5acb24c0d..e4c1df98c 100755
--- a/stable/aws-cloudwatch-metrics/templates/daemonset.yaml
+++ b/stable/aws-cloudwatch-metrics/templates/daemonset.yaml
@@ -76,3 +76,15 @@ spec:
         hostPath:
           path: /dev/disk/
       terminationGracePeriodSeconds: 60
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
diff --git a/stable/aws-cloudwatch-metrics/values.yaml b/stable/aws-cloudwatch-metrics/values.yaml
index 7596c3aa4..94e286a40 100644
--- a/stable/aws-cloudwatch-metrics/values.yaml
+++ b/stable/aws-cloudwatch-metrics/values.yaml
@@ -18,3 +18,9 @@ serviceAccount:
   name:
 
 hostNetwork: false
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}