diff --git a/infra/kubernetes/platform/cert-manager/clusterissuer-letsencrypt.yaml b/infra/kubernetes/platform/cert-manager-config/clusterissuer-letsencrypt.yaml
similarity index 100%
rename from infra/kubernetes/platform/cert-manager/clusterissuer-letsencrypt.yaml
rename to infra/kubernetes/platform/cert-manager-config/clusterissuer-letsencrypt.yaml
diff --git a/infra/kubernetes/platform/cert-manager-config/kustomization.yaml b/infra/kubernetes/platform/cert-manager-config/kustomization.yaml
new file mode 100644
index 0000000..b4aac00
--- /dev/null
+++ b/infra/kubernetes/platform/cert-manager-config/kustomization.yaml
@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - clusterissuer-letsencrypt.yaml
diff --git a/infra/kubernetes/platform/cert-manager/kustomization.yaml b/infra/kubernetes/platform/cert-manager/kustomization.yaml
index c2cc64d..0e0a709 100644
--- a/infra/kubernetes/platform/cert-manager/kustomization.yaml
+++ b/infra/kubernetes/platform/cert-manager/kustomization.yaml
@@ -3,4 +3,3 @@ kind: Kustomization
 resources:
   - application.yaml
   - namespace.yaml
-  - clusterissuer-letsencrypt.yaml
diff --git a/infra/kubernetes/platform/cloudnativepg/cluster.yaml b/infra/kubernetes/platform/cloudnativepg-cluster/cluster.yaml
similarity index 100%
rename from infra/kubernetes/platform/cloudnativepg/cluster.yaml
rename to infra/kubernetes/platform/cloudnativepg-cluster/cluster.yaml
diff --git a/infra/kubernetes/platform/cloudnativepg-cluster/kustomization.yaml b/infra/kubernetes/platform/cloudnativepg-cluster/kustomization.yaml
new file mode 100644
index 0000000..993fbde
--- /dev/null
+++ b/infra/kubernetes/platform/cloudnativepg-cluster/kustomization.yaml
@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - cluster.yaml
diff --git a/infra/kubernetes/platform/cloudnativepg/kustomization.yaml b/infra/kubernetes/platform/cloudnativepg/kustomization.yaml
index 07852d1..977dcfe 100644
--- a/infra/kubernetes/platform/cloudnativepg/kustomization.yaml
+++ b/infra/kubernetes/platform/cloudnativepg/kustomization.yaml
@@ -2,4 +2,3 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - application.yaml
-  - cluster.yaml