diff --git a/devplanetv2/cluster-values/cluster-values.yaml b/devplanetv2/cluster-values/cluster-values.yaml
index da1c7d72c..6e70c4d8b 100644
--- a/devplanetv2/cluster-values/cluster-values.yaml
+++ b/devplanetv2/cluster-values/cluster-values.yaml
@@ -5,6 +5,7 @@ accountNumber: "707767160287"
 
 alb-controller:
   enabled: true
+  hostNetworkEnabled: "true"
   configuration:
     enabled: false
 
@@ -14,13 +15,16 @@ aws-s3-mountpoint:
     enabled: true
 
 calico:
-  enabled: true
+  enabled: false
   configuration:
     enabled: false
 
 cert-manager:
   enabled: true
 
+cilium:
+  enabled: true
+
 coreDNS:
   enabled: true
   configuration:
@@ -59,7 +63,7 @@ grafana-alloy:
 
 karpenter:
   enabled: true
-  targetRevision: "1.6.3"
+  targetRevision: "1.8.6"
 
 karpenter-crds:
   amiSelectorName: "EKS-1-33-al23*"
@@ -67,6 +71,8 @@ karpenter-crds:
   selectorTag: devplanetv2
   migration: true
   default:
+    weight: 90
+    disruptionBudget: "80%"   
     nodeClassRef:
       apiVersion: karpenter.k8s.aws/v1
       kind: EC2NodeClass
@@ -75,22 +81,63 @@ karpenter-crds:
     limits:
       memory: 1100Gi
     consolidationPolicy: "WhenEmptyOrUnderutilized"
-    consolidateAfter: "5m"
+    consolidateAfter: "1m"
     expireAfter: "72h"
-    volumeSize: 100Gi
+    volumeSize: 80Gi
     requirements:
       - key: karpenter.sh/capacity-type
         operator: In
-        values: [on-demand, spot]
+        values:
+          - spot
+      - key: capacity-spread
+        operator: In
+        values: ["2", "3", "4", "5", "6", "7", "8", "9"]  # 9 values = 90%          
       - key: kubernetes.io/arch
         operator: In
         values: [amd64]
-      - key: karpenter.k8s.aws/instance-family
+      - key: "karpenter.k8s.aws/instance-cpu"
+        operator: Gt
+        values: ["3"]
+
+  secondary:
+    weight: 10  
+    enabled: false
+    disruptionBudget: "80%"
+    nodeClassRef:
+      apiVersion: karpenter.k8s.aws/v1
+      kind: EC2NodeClass
+      name: secondary
+    amiFamily: AL2023
+    limits:
+      memory: 1100Gi
+    consolidationPolicy: "WhenEmptyOrUnderutilized"
+    consolidateAfter: "1m"
+    expireAfter: "72h"
+    volumeSize: 80Gi
+    requirements:
+      - key: karpenter.sh/capacity-type
+        operator: In
+        values:
+          - on-demand
+      - key: capacity-spread
         operator: In
-        values: [r8i-flex, m8i-flex]
-      - key: karpenter.k8s.aws/instance-memory
+        values: ["1"]  # 1 value = 10%          
+      - key: kubernetes.io/arch
+        operator: In
+        values: [amd64]
+      - key: "karpenter.k8s.aws/instance-cpu"
         operator: Gt
-        values: ["7000"]
+        values: ["3"]
+      - key: "karpenter.k8s.aws/instance-cpu"
+        operator: Lt
+        values: ["9"]        
+
+metrics-server:
+  enabled: true
+  hostNetworkEnabled: true
+  configuration:
+    enabled: false
+    
   workflow:
     nodeClassRef:
       apiVersion: karpenter.k8s.aws/v1
@@ -98,6 +145,7 @@ karpenter-crds:
       name: workflow
     amiFamily: AL2023
     volumeSize: 80Gi
+    sgSelector: devplanetv2-jupyter
   jupyter:
     nodeClassRef:
       apiVersion: karpenter.k8s.aws/v1