diff --git a/magma/hackfest_magma-agw-enb_vnfd/helm-charts/eechart/charts/snmpexporter/templates/base-config.yaml b/magma/hackfest_magma-agw-enb_vnfd/helm-charts/eechart/charts/snmpexporter/templates/base-config.yaml
index fcf2f18159a0b6ee431b4bcffc8c02817bd79ae0..0766b9eb516c1fa81452e215bdd9b26070aa275c 100644
--- a/magma/hackfest_magma-agw-enb_vnfd/helm-charts/eechart/charts/snmpexporter/templates/base-config.yaml
+++ b/magma/hackfest_magma-agw-enb_vnfd/helm-charts/eechart/charts/snmpexporter/templates/base-config.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: "snmp-init-config-{{ .Values.global.osm.vnf_id | lower}}"
+  name: "snmp-init-config-{{ .Release.Name }}"
 data:
   snmp.yml: |-
     # WARNING: This file was auto-generated using snmp_exporter generator, manual changes will be lost.
diff --git a/magma/hackfest_magma-agw-enb_vnfd/helm-charts/eechart/charts/snmpexporter/templates/deployment.yaml b/magma/hackfest_magma-agw-enb_vnfd/helm-charts/eechart/charts/snmpexporter/templates/deployment.yaml
index 5aef90febced06d2c3b57c4c07d7a1b9281fb269..99772ae9ce59cb4356147e05b5940ec41117eebb 100644
--- a/magma/hackfest_magma-agw-enb_vnfd/helm-charts/eechart/charts/snmpexporter/templates/deployment.yaml
+++ b/magma/hackfest_magma-agw-enb_vnfd/helm-charts/eechart/charts/snmpexporter/templates/deployment.yaml
@@ -50,5 +50,5 @@ spec:
             path: "/var/lib/osm/snmp_exporter/{{ .Values.global.osm.vnf_id | lower }}/"
         - name: init-config-volume
           configMap:
-            name: "snmp-init-config-{{ .Values.global.osm.vnf_id | lower }}"
+            name: "snmp-init-config-{{ .Release.Name }}"
           
diff --git a/magma/hackfest_magma-agw-enb_vnfd/helm-charts/eechart/charts/snmpexporter/templates/generator.yaml b/magma/hackfest_magma-agw-enb_vnfd/helm-charts/eechart/charts/snmpexporter/templates/generator.yaml
index 96f7e237d85cecfba6f7047c169ba09fdcb8865e..383bbb1974d4a6a042c95bbf7e9aa727966f9754 100644
--- a/magma/hackfest_magma-agw-enb_vnfd/helm-charts/eechart/charts/snmpexporter/templates/generator.yaml
+++ b/magma/hackfest_magma-agw-enb_vnfd/helm-charts/eechart/charts/snmpexporter/templates/generator.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: "vnf-snmp-generator-{{ .Values.global.osm.vnf_id | lower }}"
+  name: "vnf-snmp-generator-{{ .Release.Name }}"
 data:
   generator.yml: |-
-    {{ .Files.Get "snmp/generator.yml" | nindent 4}}
\ No newline at end of file
+    {{ .Files.Get "snmp/generator.yml" | nindent 4}}
diff --git a/magma/hackfest_magma-agw-enb_vnfd/helm-charts/eechart/charts/snmpexporter/templates/mibs.yaml b/magma/hackfest_magma-agw-enb_vnfd/helm-charts/eechart/charts/snmpexporter/templates/mibs.yaml
index e7b5eab55038ea9e0d17d7c8d0b9fc7dc15ddfe6..d9ac031fbf8e0a5e041e5ef1c362157b831e9882 100644
--- a/magma/hackfest_magma-agw-enb_vnfd/helm-charts/eechart/charts/snmpexporter/templates/mibs.yaml
+++ b/magma/hackfest_magma-agw-enb_vnfd/helm-charts/eechart/charts/snmpexporter/templates/mibs.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: "vnf-snmp-mibs-{{ .Values.global.osm.vnf_id | lower}}"
+  name: "vnf-snmp-mibs-{{ .Release.Name }}"
 data:
-{{ (.Files.Glob "snmp/mibs/**").AsConfig | indent 2 }}
\ No newline at end of file
+{{ (.Files.Glob "snmp/mibs/**").AsConfig | indent 2 }}
diff --git a/magma/hackfest_magma-agw-enb_vnfd/helm-charts/eechart/templates/statefulset.yaml b/magma/hackfest_magma-agw-enb_vnfd/helm-charts/eechart/templates/statefulset.yaml
index 5557b9cb76cdbe31cd97db423af2d4173ba22b0b..5429ebd72dbe680ed9dc5e3d614545a16478d1f1 100644
--- a/magma/hackfest_magma-agw-enb_vnfd/helm-charts/eechart/templates/statefulset.yaml
+++ b/magma/hackfest_magma-agw-enb_vnfd/helm-charts/eechart/templates/statefulset.yaml
@@ -58,8 +58,8 @@ spec:
           path: "/var/lib/osm/snmp_exporter/{{ .Values.global.osm.vnf_id | lower }}/"
       - name: vnf-mibs
         configMap:
-          name: "vnf-snmp-mibs-{{ .Values.global.osm.vnf_id | lower}}"
+          name: "vnf-snmp-mibs-{{ .Release.Name }}"
       - name: vnf-generator
         configMap:
-          name: "vnf-snmp-generator-{{ .Values.global.osm.vnf_id | lower}}"
+          name: "vnf-snmp-generator-{{ .Release.Name }}"
 {{- end }}
diff --git a/sample_ee_vnf/helm-charts/eechart/templates/generator.yaml b/sample_ee_vnf/helm-charts/eechart/templates/generator.yaml
index 96f7e237d85cecfba6f7047c169ba09fdcb8865e..383bbb1974d4a6a042c95bbf7e9aa727966f9754 100644
--- a/sample_ee_vnf/helm-charts/eechart/templates/generator.yaml
+++ b/sample_ee_vnf/helm-charts/eechart/templates/generator.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: "vnf-snmp-generator-{{ .Values.global.osm.vnf_id | lower }}"
+  name: "vnf-snmp-generator-{{ .Release.Name }}"
 data:
   generator.yml: |-
-    {{ .Files.Get "snmp/generator.yml" | nindent 4}}
\ No newline at end of file
+    {{ .Files.Get "snmp/generator.yml" | nindent 4}}
diff --git a/sample_ee_vnf/helm-charts/eechart/templates/mibs.yaml b/sample_ee_vnf/helm-charts/eechart/templates/mibs.yaml
index e7b5eab55038ea9e0d17d7c8d0b9fc7dc15ddfe6..d9ac031fbf8e0a5e041e5ef1c362157b831e9882 100644
--- a/sample_ee_vnf/helm-charts/eechart/templates/mibs.yaml
+++ b/sample_ee_vnf/helm-charts/eechart/templates/mibs.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: "vnf-snmp-mibs-{{ .Values.global.osm.vnf_id | lower}}"
+  name: "vnf-snmp-mibs-{{ .Release.Name }}"
 data:
-{{ (.Files.Glob "snmp/mibs/**").AsConfig | indent 2 }}
\ No newline at end of file
+{{ (.Files.Glob "snmp/mibs/**").AsConfig | indent 2 }}
diff --git a/sample_ee_vnf/helm-charts/eechart/templates/statefulset.yaml b/sample_ee_vnf/helm-charts/eechart/templates/statefulset.yaml
index a13cfa6e7a767ad96ac697fe2ae406c4b9ec6f53..112386105cefd106b0d57cc5852a13df8623ae39 100755
--- a/sample_ee_vnf/helm-charts/eechart/templates/statefulset.yaml
+++ b/sample_ee_vnf/helm-charts/eechart/templates/statefulset.yaml
@@ -56,10 +56,10 @@ spec:
           path: "/var/lib/osm/snmp_exporter/{{ .Values.global.osm.vnf_id | lower }}/"
       - name: vnf-mibs
         configMap:
-          name: "vnf-snmp-mibs-{{ .Values.global.osm.vnf_id | lower}}"
+          name: "vnf-snmp-mibs-{{ .Release.Name }}"
       - name: vnf-generator
         configMap:
-          name: "vnf-snmp-generator-{{ .Values.global.osm.vnf_id | lower}}"
+          name: "vnf-snmp-generator-{{ .Release.Name }}"
       - name: osm-ee
         hostPath:
           path: /var/lib/osm/osm/osm_osm_packages/_data
diff --git a/snmp_ee_vnf/helm-charts/eechart/charts/snmpexporter/templates/base-config.yaml b/snmp_ee_vnf/helm-charts/eechart/charts/snmpexporter/templates/base-config.yaml
index fcf2f18159a0b6ee431b4bcffc8c02817bd79ae0..0766b9eb516c1fa81452e215bdd9b26070aa275c 100644
--- a/snmp_ee_vnf/helm-charts/eechart/charts/snmpexporter/templates/base-config.yaml
+++ b/snmp_ee_vnf/helm-charts/eechart/charts/snmpexporter/templates/base-config.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: "snmp-init-config-{{ .Values.global.osm.vnf_id | lower}}"
+  name: "snmp-init-config-{{ .Release.Name }}"
 data:
   snmp.yml: |-
     # WARNING: This file was auto-generated using snmp_exporter generator, manual changes will be lost.
diff --git a/snmp_ee_vnf/helm-charts/eechart/charts/snmpexporter/templates/deployment.yaml b/snmp_ee_vnf/helm-charts/eechart/charts/snmpexporter/templates/deployment.yaml
index be0692bf9b655cf0c613f740091c7b0981439ce6..aa50011eaec00aeff1843c1e9de3681d24242577 100644
--- a/snmp_ee_vnf/helm-charts/eechart/charts/snmpexporter/templates/deployment.yaml
+++ b/snmp_ee_vnf/helm-charts/eechart/charts/snmpexporter/templates/deployment.yaml
@@ -60,5 +60,5 @@ spec:
             path: "/var/lib/osm/snmp_exporter/{{ .Values.global.osm.vnf_id | lower }}/"
         - name: init-config-volume
           configMap:
-            name: "snmp-init-config-{{ .Values.global.osm.vnf_id | lower }}"
+            name: "snmp-init-config-{{ .Release.Name }}"
           
diff --git a/snmp_ee_vnf/helm-charts/eechart/templates/generator.yaml b/snmp_ee_vnf/helm-charts/eechart/templates/generator.yaml
index 96f7e237d85cecfba6f7047c169ba09fdcb8865e..383bbb1974d4a6a042c95bbf7e9aa727966f9754 100644
--- a/snmp_ee_vnf/helm-charts/eechart/templates/generator.yaml
+++ b/snmp_ee_vnf/helm-charts/eechart/templates/generator.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: "vnf-snmp-generator-{{ .Values.global.osm.vnf_id | lower }}"
+  name: "vnf-snmp-generator-{{ .Release.Name }}"
 data:
   generator.yml: |-
-    {{ .Files.Get "snmp/generator.yml" | nindent 4}}
\ No newline at end of file
+    {{ .Files.Get "snmp/generator.yml" | nindent 4}}
diff --git a/snmp_ee_vnf/helm-charts/eechart/templates/mibs.yaml b/snmp_ee_vnf/helm-charts/eechart/templates/mibs.yaml
index e7b5eab55038ea9e0d17d7c8d0b9fc7dc15ddfe6..d9ac031fbf8e0a5e041e5ef1c362157b831e9882 100644
--- a/snmp_ee_vnf/helm-charts/eechart/templates/mibs.yaml
+++ b/snmp_ee_vnf/helm-charts/eechart/templates/mibs.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: "vnf-snmp-mibs-{{ .Values.global.osm.vnf_id | lower}}"
+  name: "vnf-snmp-mibs-{{ .Release.Name }}"
 data:
-{{ (.Files.Glob "snmp/mibs/**").AsConfig | indent 2 }}
\ No newline at end of file
+{{ (.Files.Glob "snmp/mibs/**").AsConfig | indent 2 }}
diff --git a/snmp_ee_vnf/helm-charts/eechart/templates/statefulset.yaml b/snmp_ee_vnf/helm-charts/eechart/templates/statefulset.yaml
index 24cc1db2c63aa89d09b0607478dde1efdfaee4b4..9b84df10a7815ab19d5df16c880bdda28847215a 100755
--- a/snmp_ee_vnf/helm-charts/eechart/templates/statefulset.yaml
+++ b/snmp_ee_vnf/helm-charts/eechart/templates/statefulset.yaml
@@ -51,10 +51,10 @@ spec:
           path: "/var/lib/osm/snmp_exporter/{{ .Values.global.osm.vnf_id | lower }}/"
       - name: vnf-mibs
         configMap:
-          name: "vnf-snmp-mibs-{{ .Values.global.osm.vnf_id | lower}}"
+          name: "vnf-snmp-mibs-{{ .Release.Name }}"
       - name: vnf-generator
         configMap:
-          name: "vnf-snmp-generator-{{ .Values.global.osm.vnf_id | lower}}"
+          name: "vnf-snmp-generator-{{ .Release.Name }}"
       - name: osm-ee
         hostPath:
           path: /var/lib/osm/osm/osm_osm_packages/_data
diff --git a/snmp_setcomm_ee_vnf/helm-charts/eechart/charts/snmpexporter/templates/base-config.yaml b/snmp_setcomm_ee_vnf/helm-charts/eechart/charts/snmpexporter/templates/base-config.yaml
index fcf2f18159a0b6ee431b4bcffc8c02817bd79ae0..0766b9eb516c1fa81452e215bdd9b26070aa275c 100644
--- a/snmp_setcomm_ee_vnf/helm-charts/eechart/charts/snmpexporter/templates/base-config.yaml
+++ b/snmp_setcomm_ee_vnf/helm-charts/eechart/charts/snmpexporter/templates/base-config.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: "snmp-init-config-{{ .Values.global.osm.vnf_id | lower}}"
+  name: "snmp-init-config-{{ .Release.Name }}"
 data:
   snmp.yml: |-
     # WARNING: This file was auto-generated using snmp_exporter generator, manual changes will be lost.
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 314b87f5394ce177d7d55533556521033ea188d5..749c343d15f9b379c296c0ab3a29b851be4c6cb9 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
@@ -60,5 +60,5 @@ spec:
             path: "/var/lib/osm/snmp_exporter/{{ .Values.global.osm.vnf_id | lower }}/"
         - name: init-config-volume
           configMap:
-            name: "snmp-init-config-{{ .Values.global.osm.vnf_id | lower }}"
+            name: "snmp-init-config-{{ .Release.Name }}"
           
diff --git a/snmp_setcomm_ee_vnf/helm-charts/eechart/templates/generator.yaml b/snmp_setcomm_ee_vnf/helm-charts/eechart/templates/generator.yaml
index 96f7e237d85cecfba6f7047c169ba09fdcb8865e..383bbb1974d4a6a042c95bbf7e9aa727966f9754 100644
--- a/snmp_setcomm_ee_vnf/helm-charts/eechart/templates/generator.yaml
+++ b/snmp_setcomm_ee_vnf/helm-charts/eechart/templates/generator.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: "vnf-snmp-generator-{{ .Values.global.osm.vnf_id | lower }}"
+  name: "vnf-snmp-generator-{{ .Release.Name }}"
 data:
   generator.yml: |-
-    {{ .Files.Get "snmp/generator.yml" | nindent 4}}
\ No newline at end of file
+    {{ .Files.Get "snmp/generator.yml" | nindent 4}}
diff --git a/snmp_setcomm_ee_vnf/helm-charts/eechart/templates/mibs.yaml b/snmp_setcomm_ee_vnf/helm-charts/eechart/templates/mibs.yaml
index e7b5eab55038ea9e0d17d7c8d0b9fc7dc15ddfe6..d9ac031fbf8e0a5e041e5ef1c362157b831e9882 100644
--- a/snmp_setcomm_ee_vnf/helm-charts/eechart/templates/mibs.yaml
+++ b/snmp_setcomm_ee_vnf/helm-charts/eechart/templates/mibs.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: "vnf-snmp-mibs-{{ .Values.global.osm.vnf_id | lower}}"
+  name: "vnf-snmp-mibs-{{ .Release.Name }}"
 data:
-{{ (.Files.Glob "snmp/mibs/**").AsConfig | indent 2 }}
\ No newline at end of file
+{{ (.Files.Glob "snmp/mibs/**").AsConfig | indent 2 }}
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 8b124995057b996bbf43b867ffb908da1c254f31..22fa77b0d9edeb0db02d1e0aa5e19f9c02a14f59 100755
--- a/snmp_setcomm_ee_vnf/helm-charts/eechart/templates/statefulset.yaml
+++ b/snmp_setcomm_ee_vnf/helm-charts/eechart/templates/statefulset.yaml
@@ -53,10 +53,10 @@ spec:
           path: "/var/lib/osm/snmp_exporter/{{ .Values.global.osm.vnf_id | lower }}/"
       - name: vnf-mibs
         configMap:
-          name: "vnf-snmp-mibs-{{ .Values.global.osm.vnf_id | lower}}"
+          name: "vnf-snmp-mibs-{{ .Release.Name }}"
       - name: vnf-generator
         configMap:
-          name: "vnf-snmp-generator-{{ .Values.global.osm.vnf_id | lower}}"
+          name: "vnf-snmp-generator-{{ .Release.Name }}"
       - name: osm-ee
         hostPath:
           path: /var/lib/osm/osm/osm_osm_packages/_data