diff --git a/templates/frontend/deployment.yaml b/templates/frontend/deployment.yaml
index 7a624e3..8c696c6 100644
--- a/templates/frontend/deployment.yaml
+++ b/templates/frontend/deployment.yaml
@@ -19,7 +19,7 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
-        {{- include "fcoscore.selectorLabels" . | nindent 8 }}
+        app: {{ include "fcoscore.frontend.fullname" . }}
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
diff --git a/templates/frontend/service.yaml b/templates/frontend/service.yaml
index 897be03..504f7d3 100644
--- a/templates/frontend/service.yaml
+++ b/templates/frontend/service.yaml
@@ -13,4 +13,4 @@ spec:
       protocol: TCP
       name: http
   selector:
-    {{- include "fcoscore.selectorLabels" . | nindent 4 }}
+    app: {{ include "fcoscore.frontend.fullname" . }}
diff --git a/templates/gateway/deployment.yaml b/templates/gateway/deployment.yaml
index 28d9528..631a52c 100644
--- a/templates/gateway/deployment.yaml
+++ b/templates/gateway/deployment.yaml
@@ -19,7 +19,7 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
-        {{- include "fcoscore.selectorLabels" . | nindent 8 }}
+        app: {{ include "fcoscore.gateway.fullname" . }}
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
diff --git a/templates/gateway/service.yaml b/templates/gateway/service.yaml
index f0fe64a..7879147 100644
--- a/templates/gateway/service.yaml
+++ b/templates/gateway/service.yaml
@@ -13,4 +13,4 @@ spec:
       protocol: TCP
       name: http
   selector:
-    {{- include "fcoscore.selectorLabels" . | nindent 4 }}
+    app: {{ include "fcoscore.gateway.fullname" . }}
diff --git a/templates/zenflow/deployment.yaml b/templates/zenflow/deployment.yaml
index 1a5e58a..01cc6fe 100644
--- a/templates/zenflow/deployment.yaml
+++ b/templates/zenflow/deployment.yaml
@@ -19,7 +19,7 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
-        {{- include "fcoscore.selectorLabels" . | nindent 8 }}
+        app: {{ include "fcoscore.zenflow.fullname" . }}
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
diff --git a/templates/zenflow/service.yaml b/templates/zenflow/service.yaml
index 779ad3e..23c5163 100644
--- a/templates/zenflow/service.yaml
+++ b/templates/zenflow/service.yaml
@@ -13,4 +13,4 @@ spec:
       protocol: TCP
       name: http
   selector:
-    {{- include "fcoscore.selectorLabels" . | nindent 4 }}
+    app: {{ include "fcoscore.zenflow.fullname" . }}
diff --git a/templates/zvmlet/deployment.yaml b/templates/zvmlet/deployment.yaml
index 2f1a989..c4f8ea2 100644
--- a/templates/zvmlet/deployment.yaml
+++ b/templates/zvmlet/deployment.yaml
@@ -19,7 +19,7 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
-        {{- include "fcoscore.selectorLabels" . | nindent 8 }}
+        app: {{ include "fcoscore.zvmlet.fullname" . }}
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
diff --git a/templates/zvmlet/service.yaml b/templates/zvmlet/service.yaml
index 359925c..ba956b5 100644
--- a/templates/zvmlet/service.yaml
+++ b/templates/zvmlet/service.yaml
@@ -13,4 +13,4 @@ spec:
       protocol: TCP
       name: http
   selector:
-    {{- include "fcoscore.selectorLabels" . | nindent 4 }}
+    app: {{ include "fcoscore.zvmlet.fullname" . }}