diff --git a/voltha/Chart.yaml b/voltha/Chart.yaml
index dc20f86..eae37cd 100644
--- a/voltha/Chart.yaml
+++ b/voltha/Chart.yaml
@@ -17,7 +17,7 @@
 description: A Helm chart for Voltha based on K8S resources in Voltha project
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 2.2.4
+version: 2.2.5
 
 # app version applies to multiple components with potentially different
 # container image versions
diff --git a/voltha/templates/rw-core.yaml b/voltha/templates/rw-core.yaml
index 724447e..fd8ad19 100644
--- a/voltha/templates/rw-core.yaml
+++ b/voltha/templates/rw-core.yaml
@@ -97,6 +97,10 @@
               valueFrom:
                 fieldRef:
                   fieldPath: status.podIP
+            - name: COMPONENT_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.labels['app.kubernetes.io/name']
           args:
             - "/app/rw_core"
             - "-kv_store_type=etcd"