diff --git a/clusters/d8-ugmk-prod/infrastructure/kustomization.yaml b/clusters/d8-ugmk-prod/infrastructure/kustomization.yaml
index 465f11d..51e2f6d 100644
--- a/clusters/d8-ugmk-prod/infrastructure/kustomization.yaml
+++ b/clusters/d8-ugmk-prod/infrastructure/kustomization.yaml
@@ -67,6 +67,16 @@ patches:
       - op: replace
         path: /metadata/namespace
         value: zitadel
+      - op: replace
+        path: /spec/values/primary/nodeSelector
+        value:
+          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
diff --git a/clusters/d8-ugmk-prod/infrastructure/patches/postgresql.yaml b/clusters/d8-ugmk-prod/infrastructure/patches/postgresql.yaml
index 07b4ce0..c28c7c3 100644
--- a/clusters/d8-ugmk-prod/infrastructure/patches/postgresql.yaml
+++ b/clusters/d8-ugmk-prod/infrastructure/patches/postgresql.yaml
@@ -84,7 +84,10 @@ spec:
         failureThreshold: 6
       nodeSelector:
         node.deckhouse.io/group: generic
-      tolerations: []
+      tolerations:
+        - key: dedicated.deckhouse.io
+          operator: Equal
+          value: generic
     contour:
       enabled: true
       adminUser: "postgres"
diff --git a/clusters/d8-ugmk-prod/infrastructure/patches/zitadel.yaml b/clusters/d8-ugmk-prod/infrastructure/patches/zitadel.yaml
index 1153847..b0af0bb 100644
--- a/clusters/d8-ugmk-prod/infrastructure/patches/zitadel.yaml
+++ b/clusters/d8-ugmk-prod/infrastructure/patches/zitadel.yaml
@@ -24,7 +24,10 @@ spec:
                   node.deckhouse.io/group: generic
               - op: add
                 path: /spec/template/spec/tolerations
-                value: []
+                value:
+                  - key: dedicated.deckhouse.io
+                    operator: Equal
+                    value: generic
               - op: replace
                 path: /spec/template/metadata/annotations/vault.hashicorp.com~1agent-inject-template-zitadel-vault-config.yaml
                 value: |-
@@ -55,7 +58,10 @@ spec:
                   node.deckhouse.io/group: generic
               - op: add
                 path: /spec/template/spec/tolerations
-                value: []
+                value:
+                  - key: dedicated.deckhouse.io
+                    operator: Equal
+                    value: generic
               - op: replace
                 path: /spec/template/metadata/annotations/vault.hashicorp.com~1agent-inject-template-zitadel-vault-config.yaml
                 value: |-
@@ -86,7 +92,10 @@ spec:
                   node.deckhouse.io/group: generic
               - op: add
                 path: /spec/template/spec/tolerations
-                value: []
+                value:
+                  - key: dedicated.deckhouse.io
+                    operator: Equal
+                    value: generic
               - op: replace
                 path: /spec/template/metadata/annotations/vault.hashicorp.com~1agent-inject-template-zitadel-vault-config.yaml
                 value: |-