diff --git a/src/main/helm/templates/network_policy.yaml b/src/main/helm/templates/network_policy.yaml
index fdb87891fcdcf1cd531c4ce967b4cdb202f19bb1..baa6251c50856703928a95abaa97d6461ec14a68 100644
--- a/src/main/helm/templates/network_policy.yaml
+++ b/src/main/helm/templates/network_policy.yaml
@@ -61,7 +61,7 @@ spec:
   - from:
     - namespaceSelector:
         matchLabels:
-          kubernetes.io/metadata.name: {{ (.Values.ozgcloud).zentralerEingang.namespace }}
+          kubernetes.io/metadata.name: {{ (.Values.networkPolicy).zentralerEingang.namespace }}
     ports:
     - protocol: TCP
       port: 9090 
diff --git a/src/main/helm/values.yaml b/src/main/helm/values.yaml
index 6a52c559f67052c64e943d0ea7b36149d36e88ce..eb381bae1c6abf54157dc753993482585848afbe 100644
--- a/src/main/helm/values.yaml
+++ b/src/main/helm/values.yaml
@@ -58,11 +58,11 @@ vorgangmanagerName: vorgang-manager
 usermanagerName: user-manager
 
 zufiManager:
-  address: dns://zufi.zufi-manager:9090
+  address: dns://zufi-manager.zufi:9090
 
 elasticsearch:
     certificateSecretName: elasticsearch-certificate
 
-ozgcloud:
+networkPolicy:
   zentralerEingang:
     namespace: zentraler-eingang
\ No newline at end of file
diff --git a/src/test/helm/deployment_zufimanager_address_env_test.yaml b/src/test/helm/deployment_zufimanager_address_env_test.yaml
index 4771f72d053c23395bf8a67afb2684241875cd71..8a16fc9df3dd161711d0a6803f2383106222cba8 100644
--- a/src/test/helm/deployment_zufimanager_address_env_test.yaml
+++ b/src/test/helm/deployment_zufimanager_address_env_test.yaml
@@ -39,4 +39,4 @@ tests:
           path: spec.template.spec.containers[0].env
           content:
             name: ozgcloud_zufi-manager_address
-            value:  dns://zufi.zufi-manager:9090
+            value:  dns://zufi-manager.zufi:9090
diff --git a/src/test/helm/network_policy_test.yaml b/src/test/helm/network_policy_test.yaml
index 1399b46b1cc3a67f209ddd7a1ec8795f65774c7d..4967933c1ce5593a86c54e0e9e3a01f00e31f141 100644
--- a/src/test/helm/network_policy_test.yaml
+++ b/src/test/helm/network_policy_test.yaml
@@ -178,7 +178,6 @@ tests:
     set:
       networkPolicy:
         dnsServerNamespace: test-dns-namespace
-      ozgcloud:
         zentralerEingang:
           namespace: custom-namespace
     asserts: