diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml
index c4e7b1925313525a253447cd317205b4f5cd8577..fd77bdfd23da9e05db413bf6357e93756cfe78c6 100644
--- a/src/main/helm/templates/deployment.yaml
+++ b/src/main/helm/templates/deployment.yaml
@@ -156,9 +156,9 @@ spec:
           - name: ozgcloud_user-manager_url
             value: {{ include "app.ozgcloud_migration_user-manager_address" . }}
           - name: ozgcloud_zufi-manager_address
-            value: {{ ((.Values.ozgcloud).zufiManager).address }}
+            value: {{ (.Values.zufiManager).address }}
           - name: grpc_client_zufi-manager_address
-            value: {{ ((.Values.ozgcloud).zufiManager).address }}
+            value: {{ (.Values.zufiManager).address }}
           - name: grpc_client_zufi-manager_negotiationType
             value: {{ ((.Values.ozgcloud).zufiManager).negotiationType }}
           {{- if not (.Values.database).useExternal }}
diff --git a/src/test/helm/deployment_zufimanager_address_env_test.yaml b/src/test/helm/deployment_zufimanager_address_env_test.yaml
index bdc9ce197349f1e64df32fd7f22a3e6d57e4a5ce..d7f3a9892256f9c356f5f7e2a2b47a71344916c4 100644
--- a/src/test/helm/deployment_zufimanager_address_env_test.yaml
+++ b/src/test/helm/deployment_zufimanager_address_env_test.yaml
@@ -31,24 +31,46 @@ templates:
 set:
   ozgcloud:
     environment: dev
-    zufiManager:
-      address: zufi-manager.zufi:9090
   imagePullSecret: test-image-pull-secret
 tests:
-  - it: check if zufi-manager address is correct
+  - it: check default zufi-manager address
     asserts:
       - contains:
           path: spec.template.spec.containers[0].env
           content:
             name: ozgcloud_zufi-manager_address
-            value: zufi-manager.zufi:9090
-  - it: check if zufi-manager grpc client address is set
+            value: dns:///zufi-manager.zufi:9090
+
+  - it: should set custom zufi-manager address
+    set:
+      zufiManager:
+        address: dns://other.zufi:9090
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: ozgcloud_zufi-manager_address
+            value: dns://other.zufi:9090
+
+  - it: check default zufi-manager grpc client address
     asserts:
       - contains:
           path: spec.template.spec.containers[0].env
           content:
             name: grpc_client_zufi-manager_address
-            value: zufi-manager.zufi:9090
+            value: dns:///zufi-manager.zufi:9090
+
+  - it: should set custom zufi-manager grpc client address
+    set:
+      zufiManager:
+        address: dns://other.zufi:9090
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: grpc_client_zufi-manager_address
+            value: dns://other.zufi:9090
+
   - it: check if zufi-manager negotiationType is set
     set:
       ozgcloud: