diff --git a/apigateway/helm/templates/service.yaml b/apigateway/helm/templates/service.yaml
index 7dd1235..ab8184e 100644
--- a/apigateway/helm/templates/service.yaml
+++ b/apigateway/helm/templates/service.yaml
@@ -26,6 +26,7 @@ metadata:
     {{- with .Values.extraLabels -}}
     {{ toYaml . | nindent 4 }}
     {{- end }}
+    service-name: {{ include "common.names.fullname" . }}-rt
 spec:
   type: {{ .Values.service.type }}
   ports:
@@ -48,6 +49,7 @@ metadata:
     {{- with .Values.extraLabels -}}
     {{ toYaml . | nindent 4 }}
     {{- end }}
+    service-name: {{ include "common.names.fullname" . }}-admin
 spec:
   type: {{ .Values.service.type }}
   ports:
@@ -70,6 +72,7 @@ metadata:
     {{- with .Values.extraLabels -}}
     {{ toYaml . | nindent 4 }}
     {{- end }}
+    service-name: {{ include "common.names.fullname" . }}-ui
 spec:
   type: {{ .Values.service.type }}
   sessionAffinity: ClientIP
diff --git a/apigateway/helm/templates/servicemonitor.yaml b/apigateway/helm/templates/servicemonitor.yaml
index 7dacbe9..8b5192f 100644
--- a/apigateway/helm/templates/servicemonitor.yaml
+++ b/apigateway/helm/templates/servicemonitor.yaml
@@ -42,5 +42,5 @@ spec:
   selector:
     matchLabels:
       app.kubernetes.io/instance: {{ .Release.Name }}
-      name: {{ include "apigateway.monitorServiceName" . }}
+      service-name: {{ include "apigateway.monitorServiceName" . }}
 {{- end }}
\ No newline at end of file