diff --git a/src/main/helm/templates/network_policy.yaml b/src/main/helm/templates/network_policy.yaml
index a86717297700f48a3f27349e17b24fbb4638fa8d..ba64d59e4918597d31d38d4598d5309a9287e3ff 100644
--- a/src/main/helm/templates/network_policy.yaml
+++ b/src/main/helm/templates/network_policy.yaml
@@ -29,9 +29,12 @@ spec:
 {{- end }}
   egress:
     - to:
-        - podSelector:
+        - namespaceSelector:
             matchLabels:
-              component: zufi-server
+              kubernetes.io/metadata.name: "zufi"
+          podSelector:
+            matchLabels:
+              component: "zufi-server"
       ports:
         - port: 9090
           protocol: TCP
diff --git a/src/test/helm/network_policy_test.yaml b/src/test/helm/network_policy_test.yaml
index ccd95833d7420217c7cbefde549ebf7683b6c731..6db0ccf63232ae8e01f74badd5c11f29245c5f70 100644
--- a/src/test/helm/network_policy_test.yaml
+++ b/src/test/helm/network_policy_test.yaml
@@ -84,16 +84,19 @@ tests:
                   port: 8081
             egress:
               - to:
-                  - podSelector:
+                  - namespaceSelector:
+                      matchLabels:
+                        kubernetes.io/metadata.name: "zufi"
+                    podSelector:
                       matchLabels:
-                        component: zufi-server
+                        component: "zufi-server"
                 ports:
                   - port: 9090
                     protocol: TCP
               - to:
                   - podSelector:
                       matchLabels:
-                        component: ozgcloud-mongodb
+                        component: "ozgcloud-mongodb"
                 ports:
                   - port: 27017
                     protocol: TCP