diff --git a/src/main/helm/templates/_helpers.tpl b/src/main/helm/templates/_helpers.tpl
index 3880f1d496269a2424805b416465eadffc347e3e..d372c36a7bf03ba41f97df64697eda36d8ecf120 100644
--- a/src/main/helm/templates/_helpers.tpl
+++ b/src/main/helm/templates/_helpers.tpl
@@ -54,7 +54,7 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
 {{- end -}}
 
 {{- define "app.grpc_client_archive_manager_address" -}}
-{{ printf "dns:///%s.%s:9090" ( coalesce .Values.fileManagerName "vorgang-manager" ) .Release.Namespace | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{ printf "dns:///%s.%s:9090" ( coalesce .Values.archiveManagerName "vorgang-manager" ) .Release.Namespace | replace "+" "_" | trunc 63 | trimSuffix "-" }}
 {{- end -}}
 
 {{- define "app.grpc_client_user-manager_address" -}}
diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml
index 1d023d6164b1d5b6fe16eb8cb06e2a215b472fc0..91335d88865df4177cdc971a2585193d9811cf61 100644
--- a/src/main/helm/templates/deployment.yaml
+++ b/src/main/helm/templates/deployment.yaml
@@ -81,7 +81,7 @@ spec:
         - name: grpc_client_archive-manager_address
           value: {{ include "app.grpc_client_archive_manager_address" . }}
         - name: grpc_client_archive-manager_negotiationType
-          value: {{ (.Values.fileManager).grpcClientNegotiationType | default "TLS" }}
+          value: {{ (.Values.archiveManager).grpcClientNegotiationType | default "TLS" }}
         - name: spring_profiles_active
           value: {{ include "app.envSpringProfiles" . }}
         - name: keycloak_realm
diff --git a/src/test/helm/deployment_file_manager_address_env_test.yaml b/src/test/helm/deployment_archive_manager_address_env_test.yaml
similarity index 96%
rename from src/test/helm/deployment_file_manager_address_env_test.yaml
rename to src/test/helm/deployment_archive_manager_address_env_test.yaml
index 005a8ad7886710944d5cd063293dc2f8710c3f95..148184f0fae94370660e8f49ba6caa74b9182653 100644
--- a/src/test/helm/deployment_file_manager_address_env_test.yaml
+++ b/src/test/helm/deployment_archive_manager_address_env_test.yaml
@@ -40,7 +40,7 @@ set:
 tests:
   - it: should set the archive-manager name
     set:
-      fileManagerName: my-test-archive-manager-name
+      archiveManagerName: my-test-archive-manager-name
     asserts:
       - contains:
           path: spec.template.spec.containers[0].env
diff --git a/src/test/helm/deployment_defaults_env_test.yaml b/src/test/helm/deployment_defaults_env_test.yaml
index 105decb4d20dcba730fbdc22adde91e5bc421167..ec868f133c64569d5ddf0cf73c8dc2c1cde3e9b8 100644
--- a/src/test/helm/deployment_defaults_env_test.yaml
+++ b/src/test/helm/deployment_defaults_env_test.yaml
@@ -158,7 +158,7 @@ tests:
 
   - it: should set archive-manager negotiationType plaintext
     set:
-      fileManager.grpcClientNegotiationType: PLAINTEXT
+      archiveManager.grpcClientNegotiationType: PLAINTEXT
     asserts:
       - contains:
           path: spec.template.spec.containers[0].env