diff --git a/src/main/helm/templates/_helpers.tpl b/src/main/helm/templates/_helpers.tpl
index 04474d9a37979c196389c002bf41a5f9efcb2845..148f883a66ecf7aafa31428adcbe83a6707d1ea6 100644
--- a/src/main/helm/templates/_helpers.tpl
+++ b/src/main/helm/templates/_helpers.tpl
@@ -1,7 +1,3 @@
-{{/* Chart: Name + Version */}}
-{{- define "app.chart" -}}
-{{ printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
-{{- end -}}
 
 {{- define "app.baseDomain" -}}
 {{- printf "%s.%s" (.Values.ozgcloud).bezeichner (.Values.ingress).baseUrl }}
@@ -14,7 +10,7 @@ app.kubernetes.io/instance: administration
 app.kubernetes.io/managed-by: {{ .Release.Service }}
 app.kubernetes.io/name: {{ .Release.Name }}
 app.kubernetes.io/namespace: {{ .Release.Namespace }}
-helm.sh/chart: {{ include "app.chart" . }}
+helm.sh/chart: {{ printf "%s-%s" .Chart.Name .Chart.Version }}
 {{- end -}}
 
 {{- define "app.matchLabels" }}
diff --git a/src/main/helm/templates/configmap_bindings_type.yaml b/src/main/helm/templates/configmap_bindings_type.yaml
index 28eb7c15f635cb09bc62623770b8018ed5e41b85..b31800e00fdc25ed4a17bbdce9978e9d06281fcf 100644
--- a/src/main/helm/templates/configmap_bindings_type.yaml
+++ b/src/main/helm/templates/configmap_bindings_type.yaml
@@ -22,7 +22,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: bindings-type
+  name: administration-bindings-type
   namespace: {{ .Release.Namespace }}
 data:
   type: |
diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml
index 98cb499432070cc1eba7accc37b9792dd118b72c..5c2d3b2202756c2bbb132140f7ef454ee480e178 100644
--- a/src/main/helm/templates/deployment.yaml
+++ b/src/main/helm/templates/deployment.yaml
@@ -131,7 +131,7 @@ spec:
       volumes:
         - name: bindings
           configMap:
-            name: bindings-type
+            name: administration-bindings-type
         - name: mongodb-root-ca
           secret:
             secretName: {{ .Values.database.tls.secretName }}
diff --git a/src/test/helm/deployment_volume_test.yaml b/src/test/helm/deployment_volume_test.yaml
index a6fa59e49f8d8e96111f116fcdc209f04a19a723..0625a237b77e1d234ed73d6669f686ad0990b97e 100644
--- a/src/test/helm/deployment_volume_test.yaml
+++ b/src/test/helm/deployment_volume_test.yaml
@@ -64,7 +64,7 @@ tests:
           value: "bindings"
       - equal:
           path: spec.template.spec.volumes[0].configMap.name
-          value: "bindings-type"
+          value: "administration-bindings-type"
       - equal:
           path: spec.template.spec.volumes[1].name
           value: "mongodb-root-ca"