diff --git a/chart/templates/vault/values.yaml b/chart/templates/vault/values.yaml
index 4ed8bea7a2376641bf17371e256ff3a088a0c0ff..6f0ad8be47371ca2aed761af1e675febacc610c4 100644
--- a/chart/templates/vault/values.yaml
+++ b/chart/templates/vault/values.yaml
@@ -21,7 +21,7 @@ global:
 networkPolicies:
   enabled: {{ .Values.networkPolicies.enabled }}
   ingressLabels:
-    {{- $gateway := default "public" .Values.twistlock.ingress.gateway }}
+    {{- $gateway := default "public" .Values.addons.vault.ingress.gateway }}
     {{- $default := dict "app" (dig "gateways" $gateway "ingressGateway" nil .Values.istio) "istio" nil }}
     {{- toYaml (dig "values" "gateways" $gateway "selector" $default .Values.istio) | nindent 4 }}
   nodeCidr: {{ .Values.networkPolicies.nodeCidr }}
@@ -30,6 +30,6 @@ istio:
   enabled: {{ .Values.istio.enabled }}
   vault:
     gateways:
-      - istio-system/{{ default "public" .Values.monitoring.ingress.gateway }}
+      - istio-system/{{ default "public" .Values.addons.vault.ingress.gateway }}
 
 {{- end -}}
\ No newline at end of file
diff --git a/chart/values.yaml b/chart/values.yaml
index ec581fa90a93144be102515952cf4a723841dc01..139b635d9153534bba555c45e1e99580ef597695 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -1123,6 +1123,9 @@ addons:
     # -- Values to passthrough to the keycloak chart: https://repo1.dso.mil/platform-one/big-bang/apps/security-tools/keycloak.git
     values: {}
 
+# ----------------------------------------------------------------------------------------------------------------------
+# Vault
+#
   vault:
     # -- Toggle deployment of Vault.
     enabled: false
diff --git a/tests/test-values.yaml b/tests/test-values.yaml
index 5790e8f27e6fda7619bf94f6cccb4b9b63d89d0d..932d308f89975d3c14643dd3fc3799f739ddf4d2 100644
--- a/tests/test-values.yaml
+++ b/tests/test-values.yaml
@@ -1055,4 +1055,4 @@ addons:
         cypress:
           artifacts: true 
           envs:
-            cypress_vault_url: "http://{{ .Release.Name }}.vault.svc:8200"
+            cypress_vault_url: "https://vault.bigbang.dev"