diff --git a/src/main/helm/templates/_helpers.tpl b/src/main/helm/templates/_helpers.tpl
index b08cd980bd046f5440553c26800e5c90d9d27be3..935905f2baa4918bb0fd045304abe40fc8931f6a 100644
--- a/src/main/helm/templates/_helpers.tpl
+++ b/src/main/helm/templates/_helpers.tpl
@@ -73,7 +73,7 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
 {{- end -}}
 {{- end -}}
 
-{{- define "app.grpc_client_vorgang_manager_address" -}}
+{{- define "app.grpcClientVorgangManagerAddress" -}}
 {{ printf "dns:///%s.%s:9090" ( coalesce .Values.vorgangManagerName "vorgang-manager" ) .Release.Namespace | replace "+" "_" | trunc 63 | trimSuffix "-" }}
 {{- end -}}
 
diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml
index 56e1d61af3ca2cc74d20b2eb988532725f92f13a..5d67b29ce4b11c37f4a4c5b9d8602d5714ccb314 100644
--- a/src/main/helm/templates/deployment.yaml
+++ b/src/main/helm/templates/deployment.yaml
@@ -71,7 +71,7 @@ spec:
         - name: SERVICE_BINDING_ROOT
           value: "/bindings"
         - name: grpc_client_vorgang-manager_address
-          value: {{ include "app.grpc_client_vorgang_manager_address" . }}
+          value: {{ include "app.grpcClientVorgangManagerAddress" . }}
         - name: grpc_client_vorgang-manager_negotiationType
           value: {{ (.Values.vorgangManager).grpcClientNegotiationType | default "TLS" }}
         - name: grpc_client_user-manager_address
diff --git a/src/main/helm/templates/network_policy.yaml b/src/main/helm/templates/network_policy.yaml
index b36de7cc6d5df60df559b4f8423e795b02b97800..f1e383bf84bb7247521187b08ec2d3e58a02d265 100644
--- a/src/main/helm/templates/network_policy.yaml
+++ b/src/main/helm/templates/network_policy.yaml
@@ -59,7 +59,7 @@ spec:
           kubernetes.io/metadata.name: {{ include "app.zufiNamespace" . }}
       podSelector:
         matchLabels:
-          component: {{ .Values.zufiManager.serverName }}
+          component: zufi-server
     ports:
       - port: 9090
         protocol: TCP