diff --git a/voltha-adapter-openolt/Chart.yaml b/voltha-adapter-openolt/Chart.yaml
index 2735672..a76a027 100644
--- a/voltha-adapter-openolt/Chart.yaml
+++ b/voltha-adapter-openolt/Chart.yaml
@@ -17,5 +17,5 @@
 description: A Helm chart for Voltha OpenOLT Adapter
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 2.0.1
+version: 2.0.2
 appVersion: 2.0.0
diff --git a/voltha-adapter-openolt/templates/adapters-openolt.yaml b/voltha-adapter-openolt/templates/adapters-openolt.yaml
index 1047629..83a352b 100644
--- a/voltha-adapter-openolt/templates/adapters-openolt.yaml
+++ b/voltha-adapter-openolt/templates/adapters-openolt.yaml
@@ -26,6 +26,12 @@
     metadata:
       labels:
         app: adapter-open-olt
+        app.kubernetes.io/name: "adapter-open-olt"
+        app.kubernetes.io/version: {{ quote .Chart.AppVersion }}
+        app.kubernetes.io/component: "adapter"
+        app.kubernetes.io/part-of: "voltha"
+        app.kubernetes.io/managed-by: {{ quote .Release.Service }}
+        helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
       annotations:
         cni: "calico"
     spec:
diff --git a/voltha-adapter-openonu/Chart.yaml b/voltha-adapter-openonu/Chart.yaml
index 83abb11..558d5a4 100644
--- a/voltha-adapter-openonu/Chart.yaml
+++ b/voltha-adapter-openonu/Chart.yaml
@@ -17,5 +17,5 @@
 description: A Helm chart for Voltha OpenONU Adapter
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 2.0.0
+version: 2.0.1
 appVersion: 2.0.0
diff --git a/voltha-adapter-openonu/templates/adapters-openolt.yaml b/voltha-adapter-openonu/templates/adapters-openolt.yaml
index 055e690..d4afdc7 100644
--- a/voltha-adapter-openonu/templates/adapters-openolt.yaml
+++ b/voltha-adapter-openonu/templates/adapters-openolt.yaml
@@ -26,6 +26,12 @@
     metadata:
       labels:
         app: adapter-open-onu
+        app.kubernetes.io/name: "adapter-open-onu"
+        app.kubernetes.io/version: {{ quote .Chart.AppVersion }}
+        app.kubernetes.io/component: "adapter"
+        app.kubernetes.io/part-of: "voltha"
+        app.kubernetes.io/managed-by: {{ quote .Release.Service }}
+        helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
       annotations:
         cni: "calico"
     spec:
diff --git a/voltha-adapter-simulated/Chart.yaml b/voltha-adapter-simulated/Chart.yaml
index 52cf8cb..2c20864 100644
--- a/voltha-adapter-simulated/Chart.yaml
+++ b/voltha-adapter-simulated/Chart.yaml
@@ -17,5 +17,5 @@
 description: A Helm chart for Voltha Simulated Adaptyer based on K8S resources in Voltha project
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 2.0.1
+version: 2.0.2
 appVersion: 2.0.0
diff --git a/voltha-adapter-simulated/templates/adapters-simulated.yaml b/voltha-adapter-simulated/templates/adapters-simulated.yaml
index 66ebfaa..2e61898 100644
--- a/voltha-adapter-simulated/templates/adapters-simulated.yaml
+++ b/voltha-adapter-simulated/templates/adapters-simulated.yaml
@@ -27,6 +27,12 @@
     metadata:
       labels:
         app: adapter-simulated-olt
+        app.kubernetes.io/name: "adapter-simulated-olt"
+        app.kubernetes.io/version: {{ quote .Chart.AppVersion }}
+        app.kubernetes.io/component: "adapter"
+        app.kubernetes.io/part-of: "voltha"
+        app.kubernetes.io/managed-by: {{ quote .Release.Service }}
+        helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
       annotations:
         cni: "calico"
     spec:
@@ -60,6 +66,12 @@
     metadata:
       labels:
         app: adapter-simulated-onu
+        app.kubernetes.io/name: "adapter-simulated-onu"
+        app.kubernetes.io/version: {{ quote .Chart.AppVersion }}
+        app.kubernetes.io/component: "adapter"
+        app.kubernetes.io/part-of: "voltha"
+        app.kubernetes.io/managed-by: {{ quote .Release.Service }}
+        helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
       annotations:
         cni: "calico"
     spec:
diff --git a/voltha-etcd-cluster/Chart.yaml b/voltha-etcd-cluster/Chart.yaml
index dd67ced..a63206f 100644
--- a/voltha-etcd-cluster/Chart.yaml
+++ b/voltha-etcd-cluster/Chart.yaml
@@ -16,4 +16,4 @@
 appVersion: "0.9.2"
 description: Create an etcd-cluster using etcd-operator provided CRD
 name: voltha-etcd-cluster
-version: 2.0.0
+version: 2.0.1
diff --git a/voltha-etcd-cluster/templates/etcd-cluster.yaml b/voltha-etcd-cluster/templates/etcd-cluster.yaml
index 7939a39..827ba0c 100644
--- a/voltha-etcd-cluster/templates/etcd-cluster.yaml
+++ b/voltha-etcd-cluster/templates/etcd-cluster.yaml
@@ -26,5 +26,14 @@
     - name: ETCD_AUTO_COMPACTION_RETENTION
       value: {{ quote .Values.autoCompactionRetention }}
     busyboxImage: {{ .Values.registry }}{{ .Values.images.busybox.repository }}:{{ tpl .Values.images.busybox.tag . }}
+    labels:
+      app.kubernetes.io/name: "etcd-cluster-member"
+      app.kubernetes.io/part-of: "voltha"
+      app.kubernetes.io/version: {{ quote .Chart.AppVersion }}
+      app.kubernetes.io/component: "storage"
+      app.kubernetes.io/part-of: "voltha"
+      app.kubernetes.io/managed-by: {{ quote .Release.Service }}
+      helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+
   version: {{ tpl .Values.images.etcd.tag . }}
   repository: {{ .Values.registry }}{{ .Values.images.etcd.repository }}
diff --git a/voltha/Chart.yaml b/voltha/Chart.yaml
index 11c001b..1fae3e3 100644
--- a/voltha/Chart.yaml
+++ b/voltha/Chart.yaml
@@ -17,5 +17,5 @@
 description: A Helm chart for Voltha based on K8S resources in Voltha project
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 2.0.7
+version: 2.0.8
 appVersion: 2.0.0
diff --git a/voltha/requirements.yaml b/voltha/requirements.yaml
index 21195d9..2fded67 100644
--- a/voltha/requirements.yaml
+++ b/voltha/requirements.yaml
@@ -20,5 +20,5 @@
     condition: private_kafka_cluster
   - name: voltha-etcd-cluster
     repository: file://../voltha-etcd-cluster
-    version: 2.0.0
+    version: 2.0.1
     condition: private_etcd_cluster
diff --git a/voltha/templates/api-server.yaml b/voltha/templates/api-server.yaml
index 67a9083..0221e60 100644
--- a/voltha/templates/api-server.yaml
+++ b/voltha/templates/api-server.yaml
@@ -39,6 +39,12 @@
     metadata:
       labels:
         app: voltha-api-server
+        app.kubernetes.io/name: "api-server"
+        app.kubernetes.io/version: {{ quote .Chart.AppVersion }}
+        app.kubernetes.io/component: "api"
+        app.kubernetes.io/part-of: "voltha"
+        app.kubernetes.io/managed-by: {{ quote .Release.Service }}
+        helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
       annotations:
         cni: "calico"
     spec:
diff --git a/voltha/templates/cli.yaml b/voltha/templates/cli.yaml
index edb4eb0..fe5afa5 100644
--- a/voltha/templates/cli.yaml
+++ b/voltha/templates/cli.yaml
@@ -42,6 +42,12 @@
     metadata:
       labels:
         app: vcli
+        app.kubernetes.io/name: "cli-server"
+        app.kubernetes.io/version: {{ quote .Chart.AppVersion }}
+        app.kubernetes.io/component: "cli"
+        app.kubernetes.io/part-of: "voltha"
+        app.kubernetes.io/managed-by: {{ quote .Release.Service }}
+        helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
       annotations:
         cni: "calico"
     spec:
diff --git a/voltha/templates/ofagent.yaml b/voltha/templates/ofagent.yaml
index ab256b8..81f83ec 100644
--- a/voltha/templates/ofagent.yaml
+++ b/voltha/templates/ofagent.yaml
@@ -24,6 +24,12 @@
     metadata:
       labels:
         app: ofagent
+        app.kubernetes.io/name: "open-flow-agent"
+        app.kubernetes.io/version: {{ quote .Chart.AppVersion }}
+        app.kubernetes.io/component: "integration"
+        app.kubernetes.io/part-of: "voltha"
+        app.kubernetes.io/managed-by: {{ quote .Release.Service }}
+        helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
       annotations:
         cni: "calico"
     spec:
diff --git a/voltha/templates/ro-core.yaml b/voltha/templates/ro-core.yaml
index 7644c5a..b7cbb42 100644
--- a/voltha/templates/ro-core.yaml
+++ b/voltha/templates/ro-core.yaml
@@ -27,6 +27,12 @@
     metadata:
       labels:
         app: ro-core
+        app.kubernetes.io/name: "read-only-core"
+        app.kubernetes.io/version: {{ quote .Chart.AppVersion }}
+        app.kubernetes.io/component: "core"
+        app.kubernetes.io/part-of: "voltha"
+        app.kubernetes.io/managed-by: {{ quote .Release.Service }}
+        helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
       annotations:
         cni: "calico"
     spec:
diff --git a/voltha/templates/rw-core.yaml b/voltha/templates/rw-core.yaml
index 1e43147..ee2ddd0 100644
--- a/voltha/templates/rw-core.yaml
+++ b/voltha/templates/rw-core.yaml
@@ -40,6 +40,12 @@
       labels:
         app: rw-core
         affinity-group: affinity-group-{{ $affinity_group }}
+        app.kubernetes.io/name: "read-write-core"
+        app.kubernetes.io/version: {{ quote $root.Chart.AppVersion }}
+        app.kubernetes.io/component: "core"
+        app.kubernetes.io/part-of: "voltha"
+        app.kubernetes.io/managed-by: {{ quote $root.Release.Service }}
+        helm.sh/chart: "{{ $root.Chart.Name }}-{{ $root.Chart.Version }}"
       annotations:
         cni: "calico"
     spec: