diff --git a/apps/argocd/values.yaml b/apps/argocd/values.yaml
index 885f60f..66409be 100644
--- a/apps/argocd/values.yaml
+++ b/apps/argocd/values.yaml
@@ -56,6 +56,7 @@ configs:
       g, Scooby, role:admin
 
 server:
+  replicas: 2
   extraArgs:
     - --insecure  # TLS is terminated at Istio gateway
 
@@ -100,6 +101,7 @@ controller:
         release: prometheus
 
 repoServer:
+  replicas: 2
   hostAliases:
     - ip: "172.28.101.244"
       hostnames:
diff --git a/apps/gitlab/values.yaml b/apps/gitlab/values.yaml
index f6e7d8d..d6032c3 100644
--- a/apps/gitlab/values.yaml
+++ b/apps/gitlab/values.yaml
@@ -140,7 +140,7 @@ minio:
 registry:
   enabled: true
   hpa:
-    minReplicas: 1
+    minReplicas: 2
     maxReplicas: 2
   resources:
     requests:
@@ -153,9 +153,9 @@ registry:
 gitlab:
   # GitLab Webservice - Main application
   webservice:
-    minReplicas: 1  # Homelab sizing
+    minReplicas: 2
     maxReplicas: 3
-    
+
     # Note: hostAliases for OIDC SSL validation are applied via helmfile postsync hook
     # (GitLab chart doesn't support hostAliases in values.yaml)
     
@@ -237,8 +237,8 @@ gitlab:
   # GitLab KAS (Kubernetes Agent Server) - enabled for Kubernetes cluster integration
   kas:
     enabled: true
-    minReplicas: 1
-    maxReplicas: 1
+    minReplicas: 2
+    maxReplicas: 2
     resources:
       requests:
         cpu: 25m
@@ -269,8 +269,8 @@ gitlab:
   # Praefect - Gitaly Cluster routing and transaction manager
   praefect:
     enabled: true
-    minReplicas: 1  # Homelab sizing
-    maxReplicas: 1
+    minReplicas: 2
+    maxReplicas: 2
     
     # Note: Praefect PostgreSQL config is in global.praefect.psql
     
@@ -302,8 +302,8 @@ gitlab:
   
   # Sidekiq background jobs
   sidekiq:
-    minReplicas: 1  # Homelab sizing
-    maxReplicas: 1
+    minReplicas: 2
+    maxReplicas: 2
     
     # Note: hostAliases applied via helmfile postsync hook
     
diff --git a/apps/guacamole/manifests/deployment-complete.yaml b/apps/guacamole/manifests/deployment-complete.yaml
index bfa4834..736451c 100644
--- a/apps/guacamole/manifests/deployment-complete.yaml
+++ b/apps/guacamole/manifests/deployment-complete.yaml
@@ -13,12 +13,12 @@ metadata:
     app: guacamole
     component: client
 spec:
-  replicas: 1
+  replicas: 2
   strategy:
     type: RollingUpdate
     rollingUpdate:
-      maxSurge: 0
-      maxUnavailable: 1
+      maxSurge: 1
+      maxUnavailable: 0
   selector:
     matchLabels:
       app: guacamole
@@ -159,7 +159,7 @@ metadata:
     app: guacamole
     component: guacd
 spec:
-  replicas: 1
+  replicas: 2
   selector:
     matchLabels:
       app: guacamole
diff --git a/apps/teslamate/manifests/cnpg-cluster.yaml b/apps/teslamate/manifests/cnpg-cluster.yaml
index ed2b626..84e46a6 100644
--- a/apps/teslamate/manifests/cnpg-cluster.yaml
+++ b/apps/teslamate/manifests/cnpg-cluster.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: teslamate
 spec:
   imageName: ghcr.io/cloudnative-pg/postgresql:16
-  instances: 1
+  instances: 2
 
   # Resource limits to prevent OOM
   resources:
diff --git a/infrastructure/kiali/manifests/kiali-cr.yaml b/infrastructure/kiali/manifests/kiali-cr.yaml
index 9903181..f9f3395 100644
--- a/infrastructure/kiali/manifests/kiali-cr.yaml
+++ b/infrastructure/kiali/manifests/kiali-cr.yaml
@@ -9,7 +9,7 @@ spec:
   deployment:
     namespace: istio-system
     cluster_wide_access: true
-    replicas: 1
+    replicas: 2
     pod_labels:
       sidecar.istio.io/inject: "true"
       istio.io/dataplane-mode: "none"
diff --git a/infrastructure/prometheus/values.yaml b/infrastructure/prometheus/values.yaml
index 3824ced..c244026 100644
--- a/infrastructure/prometheus/values.yaml
+++ b/infrastructure/prometheus/values.yaml
@@ -73,6 +73,8 @@ prometheus:
 
 alertmanager:
   enabled: true
+  alertmanagerSpec:
+    replicas: 2
 
 # Disable node-exporter due to PodSecurity restrictions
 prometheus-node-exporter: