diff --git a/bbsim/Chart.yaml b/bbsim/Chart.yaml
index ffecb11..f0d2341 100644
--- a/bbsim/Chart.yaml
+++ b/bbsim/Chart.yaml
@@ -16,5 +16,5 @@
 description: Broadband Simulator
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 3.0.19
+version: 3.0.20
 appVersion: 0.1.0
diff --git a/bbsim/templates/deployment.yaml b/bbsim/templates/deployment.yaml
index 3a5b91a..c0ef507 100644
--- a/bbsim/templates/deployment.yaml
+++ b/bbsim/templates/deployment.yaml
@@ -33,8 +33,14 @@
   template:
     metadata:
       labels:
-        app: {{ template "bbsim.name" . }}
+        app: "bbsim"
         release: {{ .Release.Name }}
+        app.kubernetes.io/name: "bbsim"
+        app.kubernetes.io/version: {{ quote .Chart.AppVersion }}
+        app.kubernetes.io/component: "device-emulator"
+        app.kubernetes.io/part-of: "voltha"
+        app.kubernetes.io/managed-by: {{ quote .Release.Service }}
+        helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     spec:
       serviceAccount: {{ .Values.serviceAccountName }}
       serviceAccountName: {{ .Values.serviceAccountName }}