diff --git a/alfa-client/apps/admin/src/main/helm/Chart.yaml b/alfa-client/apps/admin/src/main/helm/Chart.yaml
index 7f1c7ec2c239956bf3b275ede276c5520603a2b1..98e2c2f72c110125d1ecf1e333e1b696841e9834 100644
--- a/alfa-client/apps/admin/src/main/helm/Chart.yaml
+++ b/alfa-client/apps/admin/src/main/helm/Chart.yaml
@@ -24,7 +24,7 @@
 
 apiVersion: v1
 appVersion: '1.0'
-description: A Helm chart for Admin Client
-name: admin-client
+description: A Helm chart for Administration Client
+name: administration-client
 version: 0.0.0-MANAGED-BY-JENKINS
 icon: https://simpleicons.org/icons/helm.svg
diff --git a/alfa-client/apps/admin/src/main/helm/templates/_helpers.tpl b/alfa-client/apps/admin/src/main/helm/templates/_helpers.tpl
index 3e25f32b0a413172ebebbcd61487f45237d1e420..fd312ca2b186f6b8f711f5af52270e35a6c8905a 100644
--- a/alfa-client/apps/admin/src/main/helm/templates/_helpers.tpl
+++ b/alfa-client/apps/admin/src/main/helm/templates/_helpers.tpl
@@ -51,7 +51,7 @@
 
 {{/* Default Labels: Helm recommended best-practice labels https://helm.sh/docs/chart_best_practices/labels/ */}}
 {{- define "app.defaultLabels" }}
-app.kubernetes.io/instance: admin-client
+app.kubernetes.io/instance: administration-client
 app.kubernetes.io/managed-by: {{ include "app.managedBy" . }}
 app.kubernetes.io/name: {{ .Release.Name }}
 app.kubernetes.io/namespace: {{ include "app.namespace" . }}
@@ -80,12 +80,12 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
 
 
 {{- define "app.serviceAccountName" -}}
-{{ printf "%s" ( (.Values.serviceAccount).name | default "admin-client-service-account" ) }}
+{{ printf "%s" ( (.Values.serviceAccount).name | default "administration-client-service-account" ) }}
 {{- end -}}
 
 
 {{- define "app.baseDomain" -}}
-{{- printf "%s-%s.%s" (include "app.ozgcloudBezeichner" . ) (.Values.ozgcloud).adminDomainSuffix (include "app.baseUrl" . ) }}
+{{- printf "%s-%s.%s" (include "app.ozgcloudBezeichner" . ) (.Values.ozgcloud).administrationDomainSuffix (include "app.baseUrl" . ) }}
 {{- end -}}
 
 {{- define "app.ozgcloudBezeichner" -}}
diff --git a/alfa-client/apps/admin/src/main/helm/templates/deployment.yaml b/alfa-client/apps/admin/src/main/helm/templates/deployment.yaml
index 313812a726ff3f48bdab917e1b7ecfe8812cc3c0..d42402bb33022a66ed4f19427f3f9072b0330e2f 100644
--- a/alfa-client/apps/admin/src/main/helm/templates/deployment.yaml
+++ b/alfa-client/apps/admin/src/main/helm/templates/deployment.yaml
@@ -45,7 +45,7 @@ spec:
     metadata:
       labels:
         {{- include "app.defaultLabels" . | indent 8 }}
-        component: admin-client
+        component: administration-client
     spec:
       {{- if (.Values.serviceAccount).create }}
       serviceAccountName: {{ include "app.serviceAccountName" . }}
@@ -69,7 +69,7 @@ spec:
 
         image: "{{ .Values.image.repo }}/{{ .Values.image.name }}:{{ coalesce (.Values.image).tag "latest" }}"
         imagePullPolicy: Always
-        name: admin-client
+        name: administration-client
 
         startupProbe:
           httpGet:
diff --git a/alfa-client/apps/admin/src/main/helm/templates/ingress.yaml b/alfa-client/apps/admin/src/main/helm/templates/ingress.yaml
index eb9b7523e636cd573782b12cd4851ef087afa782..3a98e2e4a60e9dab74d960f6b51860dbc22d7fe3 100644
--- a/alfa-client/apps/admin/src/main/helm/templates/ingress.yaml
+++ b/alfa-client/apps/admin/src/main/helm/templates/ingress.yaml
@@ -49,14 +49,14 @@ spec:
             backend:
               service:
                 name: administration
-                port: 
+                port:
                   number: 8080
           - path: /
             pathType: Prefix
             backend:
               service:
-                name: admin-client
-                port: 
+                name: administration-client
+                port:
                   number: 8080
 
       host: {{ include "app.baseDomain" . }}
diff --git a/alfa-client/apps/admin/src/main/helm/templates/network_policy.yaml b/alfa-client/apps/admin/src/main/helm/templates/network_policy.yaml
index 27b2d9d14a038a1dc5c96d66ca4c464ea4a93679..9a5db61e93b95cb856adc1a337e863d1cf28fc83 100644
--- a/alfa-client/apps/admin/src/main/helm/templates/network_policy.yaml
+++ b/alfa-client/apps/admin/src/main/helm/templates/network_policy.yaml
@@ -26,7 +26,7 @@
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
 metadata:
-  name: network-policy-admin-client
+  name: network-policy-administration-client
   namespace: {{ .Release.Namespace }}
 spec:
   podSelector:
@@ -46,7 +46,7 @@ spec:
 {{- end }}
   egress:
   - to:
-    - namespaceSelector: 
+    - namespaceSelector:
         matchLabels:
           kubernetes.io/metadata.name: administration
   - to:
diff --git a/alfa-client/apps/admin/src/main/helm/templates/service.yaml b/alfa-client/apps/admin/src/main/helm/templates/service.yaml
index 53c0aa703d4563cc7322a8f672fa78c6bda526eb..4c3ba099a334cb01d4bcd07516d8426124e6d5a6 100644
--- a/alfa-client/apps/admin/src/main/helm/templates/service.yaml
+++ b/alfa-client/apps/admin/src/main/helm/templates/service.yaml
@@ -29,7 +29,7 @@ metadata:
   namespace: {{ include "app.namespace" . }}
   labels:
     {{- include "app.defaultLabels" . | indent 4 }}
-    component: admin-client-service
+    component: administration-client-service
 spec:
   type: ClusterIP
   ports:
@@ -40,4 +40,4 @@ spec:
 
   selector:
     {{- include "app.matchLabels" . | indent 4 }}
-    component: admin-client
\ No newline at end of file
+    component: administration-client
\ No newline at end of file
diff --git a/alfa-client/apps/admin/src/main/helm/values.yaml b/alfa-client/apps/admin/src/main/helm/values.yaml
index c1b1df2cdae5978d1c6dbe828a4a36f973f70ede..3bd9e23beaf72777caffab31fcfa85bfc25bf327 100644
--- a/alfa-client/apps/admin/src/main/helm/values.yaml
+++ b/alfa-client/apps/admin/src/main/helm/values.yaml
@@ -24,9 +24,9 @@
 
 image:
   repo: docker.ozg-sh.de
-  name: admin-client
+  name: administration-client
   tag: 0.1.0 # [default: latest]
 replicaCount: 1
 
 ozgcloud:
-  adminDomainSuffix: admin
+  administrationDomainSuffix: administration