diff --git a/bbsim/Chart.yaml b/bbsim/Chart.yaml
index 046b83e..025c564 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.24
+version: 3.0.25
 appVersion: 0.2.2
diff --git a/bbsim/templates/deployment.yaml b/bbsim/templates/deployment.yaml
index 01f39f3..1c71479 100644
--- a/bbsim/templates/deployment.yaml
+++ b/bbsim/templates/deployment.yaml
@@ -20,7 +20,8 @@
   name: {{ template "bbsim.fullname" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ template "bbsim.name" . }}
+    app: "bbsim"
+    name: {{ template "bbsim.name" . }}
     chart: {{ template "bbsim.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
@@ -28,12 +29,14 @@
   replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
-      app: {{ template "bbsim.name" . }}
+      app: "bbsim"
+      name: {{ template "bbsim.name" . }}
       release: {{ .Release.Name }}
   template:
     metadata:
       labels:
         app: "bbsim"
+        name: {{ template "bbsim.name" . }}
         release: {{ .Release.Name }}
         app.kubernetes.io/name: "bbsim"
         app.kubernetes.io/version: {{ quote .Chart.AppVersion }}
diff --git a/bbsim/templates/service.yaml b/bbsim/templates/service.yaml
index 6070ffb..46fc28a 100644
--- a/bbsim/templates/service.yaml
+++ b/bbsim/templates/service.yaml
@@ -19,7 +19,8 @@
   name: {{ template "bbsim.fullname" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ template "bbsim.name" . }}
+    app: "bbsim"
+    name: {{ template "bbsim.name" . }}
     chart: {{ template "bbsim.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
@@ -36,5 +37,6 @@
       port: {{ .Values.bbsim_sadis_port }}
       protocol: TCP
   selector:
-    app: {{ template "bbsim.name" . }}
+    app: "bbsim"
+    name: {{ template "bbsim.name" . }}
     release: {{ .Release.Name }}