diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml
index ebb2209b25b2a4b922e0bf2c6d223c218bbb4516..edfb381cc4c6e5a540411f140df4b359727c044d 100644
--- a/src/main/helm/templates/deployment.yaml
+++ b/src/main/helm/templates/deployment.yaml
@@ -111,6 +111,8 @@ spec:
           value: {{ ((.Values.ozgcloud).xdomea).behoerdenschluesselVersion | quote }}
         - name: grpc_client_zufi-manager_address
           value: {{ .Values.zufiManager.address }}
+        - name: grpc_client_zufi-manager_negotiationType
+          value: {{ (.Values.zufiManager).grpcClientNegotiationType | default "TLS" }}
         {{- if ((.Values.ozgcloud).feature).collaborationEnabled }}
         - name: ozgcloud_feature_collaborationEnabled
           value: {{ ((.Values.ozgcloud).feature).collaborationEnabled | quote }}
diff --git a/src/test/helm/deployment_collaboration_env_test.yaml b/src/test/helm/deployment_collaboration_env_test.yaml
index 598d4d9d6efdda176eb76ca35a3fc8e5b9221d8a..4cb772d0ee55c2dc51d332ecf415bc1526e2b8b2 100644
--- a/src/test/helm/deployment_collaboration_env_test.yaml
+++ b/src/test/helm/deployment_collaboration_env_test.yaml
@@ -45,4 +45,22 @@ tests:
           path: spec.template.spec.containers[0].env
           content:
             name: ozgcloud_feature_collaborationEnabled
-          any: true
\ No newline at end of file
+          any: true
+  - it: should set negotiation type
+    set:
+      zufiManager:
+        grpcClientNegotiationType: PLAINTEXT
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: grpc_client_zufi-manager_negotiationType
+            value: PLAINTEXT
+  - it: negotiation type is TLS in standard
+    set:
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: grpc_client_zufi-manager_negotiationType
+            value: TLS
\ No newline at end of file