diff --git a/clusters/d8-ugmk-prod/infrastructure/kustomization.yaml b/clusters/d8-ugmk-prod/infrastructure/kustomization.yaml
deleted file mode 100644
index 8dfa458..0000000
--- a/clusters/d8-ugmk-prod/infrastructure/kustomization.yaml
+++ /dev/null
@@ -1,111 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-  - ../../../infrastructure/kafka
-  - ../../../infrastructure/rabbitmq
-  - ../../../infrastructure/camunda
-  - ../../../infrastructure/vault
-  - ../../../infrastructure/postgresql
-  - ../../../infrastructure/zitadel
-  - ../../../infrastructure/istio-config
-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
-  - path: ./patches/istio-config.yaml
-    target:
-      group: helm.toolkit.fluxcd.io
-      version: v2
-      kind: HelmRelease
-      name: istio-config
-      namespace: default
diff --git a/clusters/d8-ugmk-prod/kustomization.yaml b/clusters/d8-ugmk-prod/kustomization.yaml
index dcb749b..7d035fd 100644
--- a/clusters/d8-ugmk-prod/kustomization.yaml
+++ b/clusters/d8-ugmk-prod/kustomization.yaml
@@ -3,5 +3,14 @@ kind: Kustomization
 resources:
   - ./flux-system
   - ./helm-repositories.yaml
-  - ./infrastructure
+
+# infrastructure
+  - ../../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
+  - ../../infrastructure/istio-config/d8-ugmk-prod
+
   - ./bootstrap-jobs
diff --git a/clusters/d8-ugmk-prod/infrastructure/patches/istio-config.yaml b/infrastructure/istio-config/d8-ugmk-prod/istio-config.yaml
similarity index 100%
rename from clusters/d8-ugmk-prod/infrastructure/patches/istio-config.yaml
rename to infrastructure/istio-config/d8-ugmk-prod/istio-config.yaml
diff --git a/infrastructure/istio-config/d8-ugmk-prod/kustomization.yaml b/infrastructure/istio-config/d8-ugmk-prod/kustomization.yaml
new file mode 100644
index 0000000..894c51a
--- /dev/null
+++ b/infrastructure/istio-config/d8-ugmk-prod/kustomization.yaml
@@ -0,0 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ../base
+patches:
+  - path: istio-config.yaml