diff --git a/charts/tango-base/templates/ingress.yaml b/charts/tango-base/templates/ingress.yaml
index dd26354dd391d9404e9201b04d53e12a3610ac77..fb422968ea3cd26941dae0dfa642455514f80858 100644
--- a/charts/tango-base/templates/ingress.yaml
+++ b/charts/tango-base/templates/ingress.yaml
@@ -24,7 +24,7 @@ spec:
         paths:
           - path: /
             backend:
-              serviceName:  tango-rest-{{ template "tango-base.name" . }}-{{ .Release.Name }}
+              serviceName:  {{ template "tango-base.name" . }}-{{ .Values.tangorest.component }}
               servicePort: 8080
 {{- if .Values.ingress.tls.enabled }}
   tls:
diff --git a/charts/tango-base/templates/tango-rest.yaml b/charts/tango-base/templates/tango-rest.yaml
index cd56212fa01ff2dec597409315cbd9c92996602a..fb0c68926699abbf2c7266e10d1c43f049143a0f 100644
--- a/charts/tango-base/templates/tango-rest.yaml
+++ b/charts/tango-base/templates/tango-rest.yaml
@@ -20,6 +20,9 @@ spec:
   selector:
 {{ toYaml .Values.global.labels | indent 4 }}
     component: {{ .Values.tangorest.component }}
+    function: {{ .Values.tangorest.function }}
+    domain: {{ .Values.tangorest.domain }}
+    intent: {{ .Values.tangorest.intent }}
 
 ---
 apiVersion: apps/v1