diff --git a/stx-snmp-helm/stx-snmp-helm/helm-charts/snmp/templates/deployment.yaml b/stx-snmp-helm/stx-snmp-helm/helm-charts/snmp/templates/deployment.yaml
index bc03596..8f7a019 100755
--- a/stx-snmp-helm/stx-snmp-helm/helm-charts/snmp/templates/deployment.yaml
+++ b/stx-snmp-helm/stx-snmp-helm/helm-charts/snmp/templates/deployment.yaml
@@ -23,10 +23,14 @@ spec:
     spec:
       imagePullSecrets:
         - name: default-registry-key
+{{- with .Values.tolerations }}
       tolerations:
-        - key: "node-role.kubernetes.io/master"
-          operator: "Exists"
-          effect: "NoSchedule"
+{{ toYaml . | indent 6 }}
+{{- end }}
+{{- if .Values.nodeSelector }}
+      nodeSelector:
+{{ .Values.nodeSelector | toYaml | trim | indent 8 }}
+{{- end }}
       containers:
         - name: {{ .Chart.Name }}
           image: "{{ .Values.snmp.image.repository }}:{{ .Values.snmp.image.tag }}"
diff --git a/stx-snmp-helm/stx-snmp-helm/helm-charts/snmp/values.yaml b/stx-snmp-helm/stx-snmp-helm/helm-charts/snmp/values.yaml
index 39168dc..a7219c6 100755
--- a/stx-snmp-helm/stx-snmp-helm/helm-charts/snmp/values.yaml
+++ b/stx-snmp-helm/stx-snmp-helm/helm-charts/snmp/values.yaml
@@ -30,6 +30,13 @@ image:
 nameOverride: ""
 fullnameOverride: ""
 
+nodeSelector: { node-role.kubernetes.io/master: "" }
+
+tolerations:
+  - key: "node-role.kubernetes.io/master"
+    operator: "Exists"
+    effect: "NoSchedule"
+
 configmap:
   name_snmpd: snmpd-etc-config
   name_fm: snmpd-fm