diff --git a/tatort/templates/service.yaml b/tatort/templates/service.yaml
index 6fba2d7..f9a22ac 100644
--- a/tatort/templates/service.yaml
+++ b/tatort/templates/service.yaml
@@ -2,12 +2,18 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "tatort.fullname" . }}
+  labels:
+    {{- include "tatort.labels" . | nindent 4 }}
+  {{- with .Values.service.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   type: {{ .Values.service.type }}
-  selector:
-    app: {{ include "tatort.name" . }}
   ports:
     - port: {{ .Values.service.port }}
-      targetPort: 80
+      targetPort: {{ .Values.service.name }}
       protocol: TCP
-      name: http
+      name: {{ .Values.service.name }}
+  selector:
+    {{- include "tatort.selectorLabels" . | nindent 4 }}