diff --git a/chart/values.yaml b/chart/values.yaml
index a38b0bd315db32488948e783222d97242bcd9089..e4fcc0c34f4bfb8e253a99756974162ef0d1539e 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -110,7 +110,7 @@ networkPolicies:
   nodeCidr: ""
 
 # -- Global ImagePullPolicy value for all packages
-# Permitted values are: None, Always, IfNotPresent 
+# Permitted values are: None, Always, IfNotPresent
 imagePullPolicy: IfNotPresent
 
 
@@ -1198,7 +1198,7 @@ addons:
     git:
       repo: https://repo1.dso.mil/platform-one/big-bang/apps/sandbox/vault.git
       path: "./chart"
-      tag: "0.16.1-bb.3"
+      tag: "0.18.0-bb.0"
 
     # -- Flux reconciliation overrides specifically for the Vault Package
     flux: {}
diff --git a/tests/test-values.yaml b/tests/test-values.yaml
index 3bab446b1a5b36b151e9f83186e01869250af88f..5da9ac6c064a0d7bf0b7f75d3f46004bfc219a7d 100644
--- a/tests/test-values.yaml
+++ b/tests/test-values.yaml
@@ -290,7 +290,7 @@ monitoring:
   enabled: true
   sso:
     enabled: false
-    prometheus: 
+    prometheus:
       client_id: platform1_a8604cc9-f5e9-4656-802d-d05624370245_bb8-prometheus
     alertmanager:
       client_id: platform1_a8604cc9-f5e9-4656-802d-d05624370245_bb8-alertmanager
@@ -327,7 +327,7 @@ monitoring:
             revision: 1
             datasource: Prometheus
       downloadDashboards:
-        resources: 
+        resources:
           limits:
             cpu: 20m
             memory: 20Mi
@@ -1065,10 +1065,23 @@ addons:
     values:
       server:
         dataStorage:
-          enabled: true 
+          enabled: true
+      injector:
+        affinity: |
+          podAntiAffinity:
+            preferredDuringSchedulingIgnoredDuringExecution:
+              - weight: 100
+                podAffinityTerm:
+                  labelSelector:
+                    matchLabels:
+                      app.kubernetes.io/name: {{ template "vault.name" . }}-agent-injector
+                      app.kubernetes.io/instance: "{{ .Release.Name }}"
+                      component: webhook
+                  topologyKey: kubernetes.io/hostname
+ 
       bbtests:
         enabled: true
         cypress:
-          artifacts: true 
+          artifacts: true
           envs:
             cypress_vault_url: "https://vault.bigbang.dev"