diff --git a/values/system/oceanbox/network/csi-addons-controller/allow-9070-host.yaml b/values/csi-addons-system/manifests/allow-9070-host.yaml
similarity index 100%
rename from values/system/oceanbox/network/csi-addons-controller/allow-9070-host.yaml
rename to values/csi-addons-system/manifests/allow-9070-host.yaml
diff --git a/values/system/oceanbox/network/dapr/allow-api-server.yaml b/values/dapr/manifests/network/allow-api-server.yaml
similarity index 100%
rename from values/system/oceanbox/network/dapr/allow-api-server.yaml
rename to values/dapr/manifests/network/allow-api-server.yaml
diff --git a/values/system/oceanbox/network/dapr/allow-remote-node.yaml b/values/dapr/manifests/network/allow-remote-node.yaml
similarity index 100%
rename from values/system/oceanbox/network/dapr/allow-remote-node.yaml
rename to values/dapr/manifests/network/allow-remote-node.yaml
diff --git a/values/system/oceanbox/network/rabbitmq/policy-allow-rabbitmq.yaml b/values/rabbitmq/manifests/network/policy-allow-rabbitmq.yaml
similarity index 100%
rename from values/system/oceanbox/network/rabbitmq/policy-allow-rabbitmq.yaml
rename to values/rabbitmq/manifests/network/policy-allow-rabbitmq.yaml
diff --git a/values/system/oceanbox/network/geoserver/allow-geoserver-ingress.yaml b/values/system/oceanbox/network/geoserver/allow-geoserver-ingress.yaml
deleted file mode 100644
index 8c81a10d..00000000
--- a/values/system/oceanbox/network/geoserver/allow-geoserver-ingress.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-apiVersion: cilium.io/v2
-kind: CiliumNetworkPolicy
-metadata:
-  name: allow-geoserver-ingress
-  namespace: geoserver
-spec:
-  endpointSelector:
-    matchLabels:
-      app.kubernetes.io/instance: geoserver
-  ingress:
-    - fromEndpoints:
-      - matchLabels:
-          io.kubernetes.pod.namespace: ingress-nginx