diff --git a/clusters/d8-ugmk-prod/infrastructure/kustomization.yaml b/clusters/d8-ugmk-prod/infrastructure/kustomization.yaml
index 2725078..07f1f1e 100644
--- a/clusters/d8-ugmk-prod/infrastructure/kustomization.yaml
+++ b/clusters/d8-ugmk-prod/infrastructure/kustomization.yaml
@@ -1,103 +1,9 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ../../../infrastructure/kafka
-  - ../../../infrastructure/rabbitmq
-  - ../../../infrastructure/camunda
-  - ../../../infrastructure/vault
-  - ../../../infrastructure/postgresql
-  - ../../../infrastructure/zitadel
-patches:
-  - path: ./patches/kafka.yaml
-    target:
-      group: helm.toolkit.fluxcd.io
-      version: v2
-      kind: HelmRelease
-      name: kafka
-      namespace: kafka
-  - path: ./patches/kafka-namespace.yaml
-    target:
-      version: v1
-      kind: Namespace
-      name: kafka
-  - path: ./patches/rabbitmq.yaml
-    target:
-      group: helm.toolkit.fluxcd.io
-      version: v2
-      kind: HelmRelease
-      name: rabbitmq
-      namespace: rabbitmq
-  - path: ./patches/rabbitmq-namespace.yaml
-    target:
-      version: v1
-      kind: Namespace
-      name: rabbitmq
-  - path: ./patches/camunda.yaml
-    target:
-      group: helm.toolkit.fluxcd.io
-      version: v2
-      kind: HelmRelease
-      name: camunda
-      namespace: camunda
-  - path: ./patches/camunda-namespace.yaml
-    target:
-      version: v1
-      kind: Namespace
-      name: camunda
-  - path: ./patches/vault.yaml
-    target:
-      group: helm.toolkit.fluxcd.io
-      version: v2
-      kind: HelmRelease
-      name: vault
-      namespace: vault
-  - path: ./patches/vault-namespace.yaml
-    target:
-      version: v1
-      kind: Namespace
-      name: vault
-  - path: ./patches/postgresql.yaml
-    target:
-      group: helm.toolkit.fluxcd.io
-      version: v2
-      kind: HelmRelease
-      name: postgresql
-      namespace: postgresql
-  - patch: |-
-      - op: replace
-        path: /metadata/namespace
-        value: zitadel
-      - op: replace
-        path: /spec/values/primary/nodeSelector
-        value:
-          dedicated: null
-          node.deckhouse.io/group: generic
-      - op: replace
-        path: /spec/values/primary/tolerations
-        value:
-          - key: dedicated.deckhouse.io
-            operator: Equal
-            value: generic
-    target:
-      group: helm.toolkit.fluxcd.io
-      version: v2
-      kind: HelmRelease
-      name: postgresql
-      namespace: postgresql
-  - path: ./patches/postgresql-namespace-delete.yaml
-    target:
-      version: v1
-      kind: Namespace
-      name: postgresql
-  - path: ./patches/zitadel.yaml
-    target:
-      group: helm.toolkit.fluxcd.io
-      version: v2
-      kind: HelmRelease
-      name: zitadel
-      namespace: zitadel
-  - path: ./patches/zitadel-namespace.yaml
-    target:
-      version: v1
-      kind: Namespace
-      name: zitadel
+  - ../../../infrastructure/kafka/d8-ugmk-prod
+  - ../../../infrastructure/rabbitmq/d8-ugmk-prod
+  - ../../../infrastructure/camunda/d8-ugmk-prod
+  - ../../../infrastructure/vault/d8-ugmk-prod
+  - ../../../infrastructure/postgresql/d8-ugmk-prod
+  - ../../../infrastructure/zitadel/d8-ugmk-prod
diff --git a/clusters/d8-ugmk-prod/infrastructure/patches/camunda.yaml b/infrastructure/camunda/d8-ugmk-prod/camunda.yaml
similarity index 100%
rename from clusters/d8-ugmk-prod/infrastructure/patches/camunda.yaml
rename to infrastructure/camunda/d8-ugmk-prod/camunda.yaml
diff --git a/infrastructure/camunda/d8-ugmk-prod/kustomization.yaml b/infrastructure/camunda/d8-ugmk-prod/kustomization.yaml
new file mode 100644
index 0000000..488f241
--- /dev/null
+++ b/infrastructure/camunda/d8-ugmk-prod/kustomization.yaml
@@ -0,0 +1,7 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ../base
+patches:
+  - path: namespace.yaml
+  - path: camunda.yaml
diff --git a/clusters/d8-ugmk-prod/infrastructure/patches/camunda-namespace.yaml b/infrastructure/camunda/d8-ugmk-prod/namespace.yaml
similarity index 100%
rename from clusters/d8-ugmk-prod/infrastructure/patches/camunda-namespace.yaml
rename to infrastructure/camunda/d8-ugmk-prod/namespace.yaml
diff --git a/clusters/d8-ugmk-prod/infrastructure/patches/kafka.yaml b/infrastructure/kafka/d8-ugmk-prod/kafka.yaml
similarity index 100%
rename from clusters/d8-ugmk-prod/infrastructure/patches/kafka.yaml
rename to infrastructure/kafka/d8-ugmk-prod/kafka.yaml
diff --git a/infrastructure/kafka/d8-ugmk-prod/kustomization.yaml b/infrastructure/kafka/d8-ugmk-prod/kustomization.yaml
new file mode 100644
index 0000000..0486241
--- /dev/null
+++ b/infrastructure/kafka/d8-ugmk-prod/kustomization.yaml
@@ -0,0 +1,7 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ../base
+patches:
+  - path: namespace.yaml
+  - path: kafka.yaml
diff --git a/clusters/d8-ugmk-prod/infrastructure/patches/kafka-namespace.yaml b/infrastructure/kafka/d8-ugmk-prod/namespace.yaml
similarity index 100%
rename from clusters/d8-ugmk-prod/infrastructure/patches/kafka-namespace.yaml
rename to infrastructure/kafka/d8-ugmk-prod/namespace.yaml
diff --git a/infrastructure/postgresql/d8-ugmk-prod/kustomization.yaml b/infrastructure/postgresql/d8-ugmk-prod/kustomization.yaml
new file mode 100644
index 0000000..d1a3310
--- /dev/null
+++ b/infrastructure/postgresql/d8-ugmk-prod/kustomization.yaml
@@ -0,0 +1,28 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ../base
+patches:
+  - path: postgresql.yaml
+  - path: namespace.yaml
+  - patch: |-
+      - op: replace
+        path: /metadata/namespace
+        value: zitadel
+      - op: replace
+        path: /spec/values/primary/nodeSelector
+        value:
+          dedicated: null
+          node.deckhouse.io/group: generic
+      - op: replace
+        path: /spec/values/primary/tolerations
+        value:
+          - key: dedicated.deckhouse.io
+            operator: Equal
+            value: generic
+    target:
+      group: helm.toolkit.fluxcd.io
+      version: v2
+      kind: HelmRelease
+      name: postgresql
+      namespace: postgresql
diff --git a/clusters/d8-ugmk-prod/infrastructure/patches/postgresql-namespace-delete.yaml b/infrastructure/postgresql/d8-ugmk-prod/namespace.yaml
similarity index 100%
rename from clusters/d8-ugmk-prod/infrastructure/patches/postgresql-namespace-delete.yaml
rename to infrastructure/postgresql/d8-ugmk-prod/namespace.yaml
diff --git a/clusters/d8-ugmk-prod/infrastructure/patches/postgresql.yaml b/infrastructure/postgresql/d8-ugmk-prod/postgresql.yaml
similarity index 100%
rename from clusters/d8-ugmk-prod/infrastructure/patches/postgresql.yaml
rename to infrastructure/postgresql/d8-ugmk-prod/postgresql.yaml
diff --git a/infrastructure/rabbitmq/d8-ugmk-prod/kustomization.yaml b/infrastructure/rabbitmq/d8-ugmk-prod/kustomization.yaml
new file mode 100644
index 0000000..307deda
--- /dev/null
+++ b/infrastructure/rabbitmq/d8-ugmk-prod/kustomization.yaml
@@ -0,0 +1,7 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ../base
+patches:
+  - path: namespace.yaml
+  - path: rabbitmq.yaml
diff --git a/clusters/d8-ugmk-prod/infrastructure/patches/rabbitmq-namespace.yaml b/infrastructure/rabbitmq/d8-ugmk-prod/namespace.yaml
similarity index 100%
rename from clusters/d8-ugmk-prod/infrastructure/patches/rabbitmq-namespace.yaml
rename to infrastructure/rabbitmq/d8-ugmk-prod/namespace.yaml
diff --git a/clusters/d8-ugmk-prod/infrastructure/patches/rabbitmq.yaml b/infrastructure/rabbitmq/d8-ugmk-prod/rabbitmq.yaml
similarity index 100%
rename from clusters/d8-ugmk-prod/infrastructure/patches/rabbitmq.yaml
rename to infrastructure/rabbitmq/d8-ugmk-prod/rabbitmq.yaml
diff --git a/infrastructure/vault/d8-ugmk-prod/kustomization.yaml b/infrastructure/vault/d8-ugmk-prod/kustomization.yaml
new file mode 100644
index 0000000..cddf916
--- /dev/null
+++ b/infrastructure/vault/d8-ugmk-prod/kustomization.yaml
@@ -0,0 +1,7 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ../base
+patches:
+  - path: namespace.yaml
+  - path: vault.yaml
diff --git a/clusters/d8-ugmk-prod/infrastructure/patches/vault-namespace.yaml b/infrastructure/vault/d8-ugmk-prod/namespace.yaml
similarity index 100%
rename from clusters/d8-ugmk-prod/infrastructure/patches/vault-namespace.yaml
rename to infrastructure/vault/d8-ugmk-prod/namespace.yaml
diff --git a/clusters/d8-ugmk-prod/infrastructure/patches/vault.yaml b/infrastructure/vault/d8-ugmk-prod/vault.yaml
similarity index 100%
rename from clusters/d8-ugmk-prod/infrastructure/patches/vault.yaml
rename to infrastructure/vault/d8-ugmk-prod/vault.yaml
diff --git a/infrastructure/zitadel/d8-ugmk-prod/kustomization.yaml b/infrastructure/zitadel/d8-ugmk-prod/kustomization.yaml
new file mode 100644
index 0000000..6d93956
--- /dev/null
+++ b/infrastructure/zitadel/d8-ugmk-prod/kustomization.yaml
@@ -0,0 +1,7 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ../base
+patches:
+  - path: namespace.yaml
+  - path: zitadel.yaml
diff --git a/clusters/d8-ugmk-prod/infrastructure/patches/zitadel-namespace.yaml b/infrastructure/zitadel/d8-ugmk-prod/namespace.yaml
similarity index 100%
rename from clusters/d8-ugmk-prod/infrastructure/patches/zitadel-namespace.yaml
rename to infrastructure/zitadel/d8-ugmk-prod/namespace.yaml
diff --git a/clusters/d8-ugmk-prod/infrastructure/patches/zitadel.yaml b/infrastructure/zitadel/d8-ugmk-prod/zitadel.yaml
similarity index 100%
rename from clusters/d8-ugmk-prod/infrastructure/patches/zitadel.yaml
rename to infrastructure/zitadel/d8-ugmk-prod/zitadel.yaml