diff --git a/snmp_setcomm_ee_vnf/helm-charts/eechart/charts/snmpexporter/templates/deployment.yaml b/snmp_setcomm_ee_vnf/helm-charts/eechart/charts/snmpexporter/templates/deployment.yaml
index 5aef90febced06d2c3b57c4c07d7a1b9281fb269..314b87f5394ce177d7d55533556521033ea188d5 100644
--- a/snmp_setcomm_ee_vnf/helm-charts/eechart/charts/snmpexporter/templates/deployment.yaml
+++ b/snmp_setcomm_ee_vnf/helm-charts/eechart/charts/snmpexporter/templates/deployment.yaml
@@ -14,6 +14,16 @@ spec:
       labels:
         {{- include "snmpexporter.selectorLabels" . | nindent 8 }}
     spec:
+      affinity:
+        podAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+          - labelSelector:
+              matchExpressions:
+              - key: vnf
+                operator: In
+                values:
+                - {{ .Values.global.osm.vnf_id | lower}}
+            topologyKey: "kubernetes.io/hostname"
       securityContext:
         runAsUser: 0
       initContainers:
diff --git a/snmp_setcomm_ee_vnf/helm-charts/eechart/templates/statefulset.yaml b/snmp_setcomm_ee_vnf/helm-charts/eechart/templates/statefulset.yaml
index 1868dd86fb480df75f76427c9211475d816ca855..7a2f84637e8959be185ec6ef3519727ded51bd8e 100755
--- a/snmp_setcomm_ee_vnf/helm-charts/eechart/templates/statefulset.yaml
+++ b/snmp_setcomm_ee_vnf/helm-charts/eechart/templates/statefulset.yaml
@@ -16,6 +16,7 @@ spec:
       labels:
         app.kubernetes.io/name: {{ include "eechart.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
+        vnf: {{ .Values.global.osm.vnf_id | lower}}
     spec:
       imagePullSecrets:
       - name: regcred