diff --git a/charts/smarter-device-manager/Chart.yaml b/charts/smarter-device-manager/Chart.yaml
index 5a65f9a..d474fce 100644
--- a/charts/smarter-device-manager/Chart.yaml
+++ b/charts/smarter-device-manager/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: smarter-device-manager
 description: smarter-device-manager chart for SMARTER edge devices
 home: https://getsmarter.io
-version: 0.0.10
+version: 0.0.11
 appVersion: v1.20.12
 kubeVersion: ">=1.16.0-0"
 keywords:
diff --git a/charts/smarter-device-manager/templates/common.yaml b/charts/smarter-device-manager/templates/common.yaml
index 3647554..c2ba323 100644
--- a/charts/smarter-device-manager/templates/common.yaml
+++ b/charts/smarter-device-manager/templates/common.yaml
@@ -29,6 +29,9 @@ spec:
         operator: "Equal"
         value: "edge"
         effect: "NoSchedule"
+      {{- if .Values.tolerations }}
+      {{- toYaml .Values.tolerations | nindent 6 }}
+      {{- end }}
       priorityClassName: "system-node-critical"
       hostname: {{ .Values.application.appName }}
       hostNetwork: true
diff --git a/charts/smarter-device-manager/values.yaml b/charts/smarter-device-manager/values.yaml
index 1c85472..b46d7f2 100644
--- a/charts/smarter-device-manager/values.yaml
+++ b/charts/smarter-device-manager/values.yaml
@@ -9,6 +9,22 @@ image:
   tag: ""
   pullPolicy: IfNotPresent
 
+# Node labels for pod assignment
+# ref: https://kubernetes.io/docs/user-guide/node-selection/
+# nodeSelector:
+#   kubernetes.io/os: linux
+
+# Tolerations for pod assignment
+# ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
+# tolerations:
+# - key: "key1"
+#   operator: "Equal"
+#   value: "value1"
+#   effect: "NoSchedule"
+# - key: "key2"
+#   operator: "Exists"
+#   effect: "NoExecute"
+
 # If a specific configurations is used it can be provided by uncommenting this lines
 # config:
 #   - devicematch: ^snd$