diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml
index c21b9c17e45df3527a4550c51caffadb2295c26c..ebb2209b25b2a4b922e0bf2c6d223c218bbb4516 100644
--- a/src/main/helm/templates/deployment.yaml
+++ b/src/main/helm/templates/deployment.yaml
@@ -109,6 +109,8 @@ spec:
           value: {{ ((.Values.ozgcloud).xdomea).behoerdenschluesselUri}}
         - name: ozgcloud_xdomea_behoerdenschluesselVersion
           value: {{ ((.Values.ozgcloud).xdomea).behoerdenschluesselVersion | quote }}
+        - name: grpc_client_zufi-manager_address
+          value: {{ .Values.zufiManager.address }}
         {{- if ((.Values.ozgcloud).feature).collaborationEnabled }}
         - name: ozgcloud_feature_collaborationEnabled
           value: {{ ((.Values.ozgcloud).feature).collaborationEnabled | quote }}
diff --git a/src/main/helm/values.yaml b/src/main/helm/values.yaml
index 0e84c312bbfbcf0e243f8b32f2da91f815f353fe..6266e01c7cf25030561b131e411dbc5198f9d93a 100644
--- a/src/main/helm/values.yaml
+++ b/src/main/helm/values.yaml
@@ -31,7 +31,8 @@ replicaCount: 2 # [default: 2]
 
 usermanagerName: user-manager
 
-
+zufiManager:
+  address: dns://zufi-server.zufi:9090
 
 # env:
 #   overrideSpringProfiles: "oc,prod"
diff --git a/src/test/helm-linter-values.yaml b/src/test/helm-linter-values.yaml
index 51a5840b198286e9e6f323503971c3e56981900f..18f72b2662390d78c5e547e1f7b90d403f8edf7d 100644
--- a/src/test/helm-linter-values.yaml
+++ b/src/test/helm-linter-values.yaml
@@ -37,3 +37,6 @@ sso:
   serverUrl: https://sso.company.local
 
 imagePullSecret: image-pull-secret
+
+zufiManager:
+  address: https://url.url
\ No newline at end of file
diff --git a/src/test/helm/deployment_collaboration_env_test.yaml b/src/test/helm/deployment_collaboration_env_test.yaml
index 21ca8ba4550390d89e333fb62a3110e389615f81..598d4d9d6efdda176eb76ca35a3fc8e5b9221d8a 100644
--- a/src/test/helm/deployment_collaboration_env_test.yaml
+++ b/src/test/helm/deployment_collaboration_env_test.yaml
@@ -14,6 +14,16 @@ set:
     serverUrl: https://sso.company.local
   imagePullSecret: image-pull-secret
 tests:
+  - it: should have set zufi server address
+    set:
+      zufiManager:
+        address: url://url.url
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: grpc_client_zufi-manager_address
+            value: url://url.url
   - it: should enable collaboration
     set:
       ozgcloud: