diff --git a/deploy/apps/kustomization.yaml b/deploy/apps/kustomization.yaml
new file mode 100644
index 0000000..4da8ab1
--- /dev/null
+++ b/deploy/apps/kustomization.yaml
@@ -0,0 +1,11 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - backups
+  - nextcloud
+  - onlyoffice
+  - whiteboard
+generatorOptions:
+  disableNameSuffixHash: true
+
+  
\ No newline at end of file
diff --git a/deploy/infra/certificate.yaml b/deploy/infra/global/certificate.yaml
similarity index 100%
rename from deploy/infra/certificate.yaml
rename to deploy/infra/global/certificate.yaml
diff --git a/deploy/infra/global/kustomization.yaml b/deploy/infra/global/kustomization.yaml
new file mode 100644
index 0000000..2514b69
--- /dev/null
+++ b/deploy/infra/global/kustomization.yaml
@@ -0,0 +1,8 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: cloud-limbosolutions-com
+
+resources:
+  - ./certificate.yaml
+  - ./network-policies.yaml
+
diff --git a/deploy/infra/network-policies.yaml b/deploy/infra/global/network-policies.yaml
similarity index 100%
rename from deploy/infra/network-policies.yaml
rename to deploy/infra/global/network-policies.yaml
diff --git a/deploy/infra/kustomization.yaml b/deploy/infra/kustomization.yaml
index c7c22fb..83a847e 100644
--- a/deploy/infra/kustomization.yaml
+++ b/deploy/infra/kustomization.yaml
@@ -1,15 +1,10 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - cd-serviceaccount.yaml
-  - network-policies.yaml
-  - middlewares.yaml
-  - certificate.yaml
-  - ingress-web.yaml
-  - ingress-web-public.yaml
-  - storage-limbosolutions-com/pv.yaml
-  - ./onlyoffice/ingress.yaml
-  - ./onlyoffice/middlewares.yaml
-  - ./whiteboard/middlewares.yaml
+  - global
+  - nextcloud
+  - onlyoffice
+  - whiteboard
 generatorOptions:
-  disableNameSuffixHash: true
\ No newline at end of file
+  disableNameSuffixHash: true
+
diff --git a/deploy/infra/onlyoffice/kustomization.yaml b/deploy/infra/onlyoffice/kustomization.yaml
new file mode 100644
index 0000000..ded9e50
--- /dev/null
+++ b/deploy/infra/onlyoffice/kustomization.yaml
@@ -0,0 +1,8 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: cloud-limbosolutions-com
+
+resources:
+  - ./ingress.yaml
+  - ./middlewares.yaml
+
diff --git a/deploy/infra/whiteboard/kustomization.yaml b/deploy/infra/whiteboard/kustomization.yaml
new file mode 100644
index 0000000..7cc028a
--- /dev/null
+++ b/deploy/infra/whiteboard/kustomization.yaml
@@ -0,0 +1,7 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: cloud-limbosolutions-com
+
+resources:
+  - ./middlewares.yaml
+