diff --git a/src/main/helm/values.yaml b/src/main/helm/values.yaml
index cbe0455fe1fc068bbf418490c85d07a54e670b2b..6a380e033dcf8986792b1e8b8ca9f92a4ab81a0c 100644
--- a/src/main/helm/values.yaml
+++ b/src/main/helm/values.yaml
@@ -60,7 +60,7 @@ usermanagerName: user-manager
 administrationName: administration
 
 zufiManager:
-  address: dns:///zufi-manager.zufi:9090
+  address: dns:///zufi-server.zufi:9090
 
 elasticsearch:
     certificateSecretName: elasticsearch-certificate
diff --git a/src/test/helm/deployment_zufimanager_address_env_test.yaml b/src/test/helm/deployment_zufimanager_address_env_test.yaml
index d7f3a9892256f9c356f5f7e2a2b47a71344916c4..2aa776f1f8094e1da169085b2e84c74ef478992c 100644
--- a/src/test/helm/deployment_zufimanager_address_env_test.yaml
+++ b/src/test/helm/deployment_zufimanager_address_env_test.yaml
@@ -39,7 +39,7 @@ tests:
           path: spec.template.spec.containers[0].env
           content:
             name: ozgcloud_zufi-manager_address
-            value: dns:///zufi-manager.zufi:9090
+            value: dns:///zufi-server.zufi:9090
 
   - it: should set custom zufi-manager address
     set:
@@ -58,7 +58,7 @@ tests:
           path: spec.template.spec.containers[0].env
           content:
             name: grpc_client_zufi-manager_address
-            value: dns:///zufi-manager.zufi:9090
+            value: dns:///zufi-server.zufi:9090
 
   - it: should set custom zufi-manager grpc client address
     set: