diff --git a/cnpg/helm-values.yaml b/cnpg/helm-values.yaml
index 854e8a9..275711c 100644
--- a/cnpg/helm-values.yaml
+++ b/cnpg/helm-values.yaml
@@ -8,7 +8,7 @@ image:
   pullPolicy: IfNotPresent
 
 # Replica count for operator
-replicaCount: 1
+replicaCount: 2
 
 # Resource requests for operator
 resources:
@@ -67,8 +67,16 @@ nodeSelector: {}
 # Tolerations
 tolerations: []
 
-# Affinity
-affinity: {}
+# Affinity - Soft Anti-Affinity to spread pods across nodes
+affinity:
+  podAntiAffinity:
+    preferredDuringSchedulingIgnoredDuringExecution:
+      - weight: 100
+        podAffinityTerm:
+          labelSelector:
+            matchLabels:
+              app.kubernetes.io/name: cloudnative-pg
+          topologyKey: kubernetes.io/hostname
 
 # Security context
 securityContext:
diff --git a/minio/manifests/console-deployment.yaml b/minio/manifests/console-deployment.yaml
index 827591a..92c13e9 100644
--- a/minio/manifests/console-deployment.yaml
+++ b/minio/manifests/console-deployment.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     app: minio-console
 spec:
-  replicas: 1
+  replicas: 2
   selector:
     matchLabels:
       app: minio-console
@@ -15,6 +15,15 @@ spec:
       labels:
         app: minio-console
     spec:
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+            - weight: 100
+              podAffinityTerm:
+                labelSelector:
+                  matchLabels:
+                    app: minio-console
+                topologyKey: kubernetes.io/hostname
       containers:
         - name: console
           image: ghcr.io/georgmangold/console:v1.9.1
diff --git a/pgweb/helm-values.yaml b/pgweb/helm-values.yaml
index 6da09de..f2bc689 100644
--- a/pgweb/helm-values.yaml
+++ b/pgweb/helm-values.yaml
@@ -3,6 +3,7 @@
 
 controllers:
   main:
+    replicaCount: 2
     annotations:
       reloader.stakater.com/auto: "true"
     containers:
@@ -42,6 +43,16 @@ controllers:
                 port: 8081
               initialDelaySeconds: 5
               periodSeconds: 5
+    # Affinity - Soft Anti-Affinity to spread pods across nodes
+    affinity:
+      podAntiAffinity:
+        preferredDuringSchedulingIgnoredDuringExecution:
+          - weight: 100
+            podAffinityTerm:
+              labelSelector:
+                matchLabels:
+                  app.kubernetes.io/name: pgweb
+              topologyKey: kubernetes.io/hostname
 
 service:
   main:
diff --git a/velero/argocd.yaml b/velero/argocd.yaml
index 58463fe..0dadeba 100644
--- a/velero/argocd.yaml
+++ b/velero/argocd.yaml
@@ -71,7 +71,7 @@ spec:
           tag: latest
           pullPolicy: IfNotPresent
 
-        replicaCount: 1
+        replicaCount: 2
 
         resources:
           requests:
@@ -87,6 +87,16 @@ spec:
         env:
           - name: BASIC_AUTH_ENABLED
             value: "false"
+
+        affinity:
+          podAntiAffinity:
+            preferredDuringSchedulingIgnoredDuringExecution:
+              - weight: 100
+                podAffinityTerm:
+                  labelSelector:
+                    matchLabels:
+                      app: velero-ui
+                  topologyKey: kubernetes.io/hostname
         envFrom: []
 
         podSecurityContext: