diff --git a/charts/vespa/templates/service.yaml b/charts/vespa/templates/service.yaml
index fab94ff..969bd8c 100644
--- a/charts/vespa/templates/service.yaml
+++ b/charts/vespa/templates/service.yaml
@@ -12,6 +12,6 @@ spec:
       targetPort: {{ .targetPort }}
       protocol: TCP
       name: {{ .name }}
-    {{- end }}    
+    {{- end }}
   selector:
-    {{- include "vespa.selectorLabels" . | nindent 4 }}
+    {{- toYaml .Values.podLabels | nindent 4 }}
diff --git a/charts/vespa/templates/statefulset.yaml b/charts/vespa/templates/statefulset.yaml
index fe10647..7091cd7 100644
--- a/charts/vespa/templates/statefulset.yaml
+++ b/charts/vespa/templates/statefulset.yaml
@@ -11,7 +11,7 @@ spec:
   {{- end }}
   selector:
     matchLabels:
-      {{- toYaml .Values.selectorLabels | nindent 6 }}
+      {{- toYaml .Values.podLabels | nindent 6 }}
   template:
     metadata:
       {{- with .Values.podAnnotations }}
@@ -52,9 +52,9 @@ spec:
             {{- toYaml . | nindent 12 }}
           {{- end }}
           env:
-          - name: VESPA_CONFIGSERVERS 
+          - name: VESPA_CONFIGSERVERS
             value: vespa-0.vespa.{{ .Release.Namespace }}.svc.cluster.local
-            
+
   volumeClaimTemplates:
   {{- range .Values.volumeClaimTemplates }}
   - metadata:
@@ -64,4 +64,4 @@ spec:
       resources:
         requests:
           storage: {{ .spec.resources.requests.storage }}
-  {{- end }}
\ No newline at end of file
+  {{- end }}
diff --git a/charts/vespa/values.yaml b/charts/vespa/values.yaml
index 1049310..731752a 100644
--- a/charts/vespa/values.yaml
+++ b/charts/vespa/values.yaml
@@ -30,17 +30,13 @@ podAnnotations: {}
 podLabels:
   app: vespa
 
-selectorLabels:
-  app: vespa
-  
-
 statefulSet:
   name: vespa
   ports:
     - containerPort: 19071
     - containerPort: 8081
-      
-podSecurityContext: 
+
+podSecurityContext:
   # fsGroup: 2000
 
 readinessProbe:
@@ -49,7 +45,7 @@ readinessProbe:
      port: 19071
      scheme: HTTP
 
-securityContext: 
+securityContext:
   # capabilities:
   #   drop:
   #   - ALL
@@ -87,7 +83,7 @@ ingress:
   #    hosts:
   #      - chart-example.local
 
-resources: 
+resources:
   requests:
     memory: "1000Mi"
     cpu: "500m"
@@ -110,7 +106,7 @@ volumes: []
 #     optional: false
 
 # Additional volumeMounts on the output Deployment definition.
-volumeMounts: 
+volumeMounts:
   - name: vespa-storage
     mountPath: /opt/vespa/var/
 
@@ -132,4 +128,4 @@ volumeClaimTemplates:
          - ReadWriteOnce
        resources:
          requests:
-           storage: 1Gi    
\ No newline at end of file
+           storage: 1Gi