diff --git a/src/main/helm/templates/network_policy.yaml b/src/main/helm/templates/network_policy.yaml
index 3808e4bb7a84a8d65ff7387a73152098ec842592..e3e934bcf2512f810ac66837eeb74669a843aa7e 100644
--- a/src/main/helm/templates/network_policy.yaml
+++ b/src/main/helm/templates/network_policy.yaml
@@ -59,10 +59,10 @@ spec:
   - from:
     - namespaceSelector:
         matchLabels:
-          kubernetes.io/metadata.name: {{ required "ozgcloud.antragraum.namespace must be set if antragraum is enabled" ((.Values.ozgcloud).antragraum).namespace }}
+          kubernetes.io/metadata.name: {{((.Values.ozgcloud).antragraum).antragsraumProxyNamespace | default "antragsraum-proxy"}}
       podSelector: 
         matchLabels:
-          component: antragsraum-server
+          component: antragsraum-proxy
 {{- end }}
 
   - from:
@@ -127,7 +127,7 @@ spec:
   - to:
       - namespaceSelector:
           matchLabels:
-            kubernetes.io/metadata.name: {{ required "ozgcloud.antragraum.namespace must be set if antragraum is enabled" ((.Values.ozgcloud).antragraum).namespace }}
+            kubernetes.io/metadata.name: {{((.Values.ozgcloud).antragraum).namespace | default "antragraum"}}
         podSelector: 
           matchLabels:
             component: info-manager
diff --git a/src/test/helm/network_policy_test.yaml b/src/test/helm/network_policy_test.yaml
index d96ceb8d562bc5631faca0bd8e8c875e4f797eb2..b7e9d4650328f3c91c39415893510530a27162b6 100644
--- a/src/test/helm/network_policy_test.yaml
+++ b/src/test/helm/network_policy_test.yaml
@@ -140,15 +140,33 @@ tests:
                   matchLabels:
                     name: test-monitoring
 
+  - it: should add ingress rule for antragraum-proxy if antragraum is enabled
+    set:
+      networkPolicy:
+        dnsServerNamespace: test-dns-namespace
+      ozgcloud:
+        antragraum:
+          enabled: true
+    asserts:
+    - contains:
+        path: spec.ingress
+        content:
+          from:
+            - namespaceSelector:
+                matchLabels:
+                  kubernetes.io/metadata.name: antragsraum-proxy
+              podSelector: 
+                matchLabels:
+                  component: antragsraum-proxy
 
-  - it: should add ingress rule for antragraum if antragraum is enabled
+  - it: should set ingress rule for antragraum-proxy if antragraum is enabled
     set:
       networkPolicy:
         dnsServerNamespace: test-dns-namespace
       ozgcloud:
         antragraum:
           enabled: true
-          namespace: antragraum02
+          antragsraumProxyNamespace: antragsraum-proxy
     asserts:
     - contains:
         path: spec.ingress
@@ -156,10 +174,10 @@ tests:
           from:
             - namespaceSelector:
                 matchLabels:
-                  kubernetes.io/metadata.name: antragraum02
+                  kubernetes.io/metadata.name: antragsraum-proxy
               podSelector: 
                 matchLabels:
-                  component: antragsraum-server
+                  component: antragsraum-proxy
 
 
   - it: should not add ingress rule for antragraum if antragraum is disabled
@@ -176,21 +194,30 @@ tests:
           from:
             - namespaceSelector:
                 matchLabels:
-                  kubernetes.io/metadata.name: antragraum02
+                  kubernetes.io/metadata.name: antragraum
               podSelector: 
                 matchLabels:
                   component: antragraum-server
 
-  - it: should throw error if antragraum is enabled but antragraum namespace is not set
+  - it: should not add ingress rule for antragraum-proxy if antragraum is disabled
     set:
       networkPolicy:
         dnsServerNamespace: test-dns-namespace
       ozgcloud:
         antragraum:
-          enabled: true
+          enabled: false
     asserts:
-      - failedTemplate:
-          errorMessage: ozgcloud.antragraum.namespace must be set if antragraum is enabled
+    - notContains:
+        path: spec.ingress
+        content:
+          from:
+            - namespaceSelector:
+                matchLabels:
+                  kubernetes.io/metadata.name: antragraum-proxy
+              podSelector: 
+                matchLabels:
+                  component: antragraum-proxy
+        any: true
 
   - it: should add default ingress rule for zentraler-eingang
     set:
@@ -355,7 +382,6 @@ tests:
       ozgcloud:
         antragraum:
           enabled: true
-          namespace: antragraum02
     asserts:
       - contains:
           path: spec.egress
@@ -363,7 +389,27 @@ tests:
             to:
               - namespaceSelector:
                   matchLabels:
-                    kubernetes.io/metadata.name: antragraum02
+                    kubernetes.io/metadata.name: antragraum
+                podSelector: 
+                  matchLabels:
+                    component: info-manager
+
+  - it: should set egress rule to info-manager if antragraum is enabled
+    set:
+      networkPolicy:
+        dnsServerNamespace: test-dns-namespace
+      ozgcloud:
+        antragraum:
+          enabled: true
+          namespace: antragraum2
+    asserts:
+      - contains:
+          path: spec.egress
+          content:
+            to:
+              - namespaceSelector:
+                  matchLabels:
+                    kubernetes.io/metadata.name: antragraum2
                 podSelector: 
                   matchLabels:
                     component: info-manager