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 }}