diff --git a/charts/portalmodelo/v0.6.0/templates/_helpers.tpl b/charts/portalmodelo/v0.6.0/templates/_helpers.tpl
index 14708b9..4e7447c 100644
--- a/charts/portalmodelo/v0.6.0/templates/_helpers.tpl
+++ b/charts/portalmodelo/v0.6.0/templates/_helpers.tpl
@@ -45,16 +45,25 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- end }}
 
 {{/*
-Selector labels
+Common selector labels
 */}}
-{{- define "portalmodelo.ploneSelectorLabels" -}}
+{{- define "portalmodelo.selectorLabels" -}}
 app.kubernetes.io/name: {{ include "portalmodelo.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+Selector labels for Plone component
+*/}}
+{{- define "portalmodelo.ploneSelectorLabels" -}}
+{{ include "portalmodelo.selectorLabels" . }}
 app.kubernetes.io/component: plone
 {{- end }}
 
+{{/*
+Selector labels for ZEO Server component
+*/}}
 {{- define "portalmodelo.zeoserverSelectorLabels" -}}
-app.kubernetes.io/name: {{ include "portalmodelo.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
+{{ include "portalmodelo.selectorLabels" . }}
 app.kubernetes.io/component: zeoserver
 {{- end }}