diff --git a/chart/templates/vault/twistlock-helmrelease.yaml b/chart/templates/vault/twistlock-helmrelease.yaml
deleted file mode 100644
index 14e476fc10595935352c30b82d1207dc0397f1ff..0000000000000000000000000000000000000000
--- a/chart/templates/vault/twistlock-helmrelease.yaml
+++ /dev/null
@@ -1,56 +0,0 @@
-{{- $fluxSettingsVault := merge .Values.vault.flux .Values.flux -}}
-{{- if .Values.vault.enabled }}
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
-kind: HelmRelease
-metadata:
-  name: vault
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app.kubernetes.io/name: vault
-    app.kubernetes.io/component: "sandbox"
-    {{- include "commonLabels" . | nindent 4}}
-spec:
-  targetNamespace: vault
-  chart:
-    spec:
-      chart: {{ .Values.vault.git.path }}
-      interval: 5m
-      sourceRef:
-        kind: GitRepository
-        name: vault
-        namespace: {{ .Release.Namespace }}
-
-  {{- toYaml $fluxSettingsVault | nindent 2 }}
-  
-  {{- if .Values.vault.postRenderers }}
-  postRenderers:
-  {{ toYaml .Values.vault.postRenderers | nindent 4 }}
-  {{- end }}
-  valuesFrom:
-    - name: {{ .Release.Name }}-vault-values
-      kind: Secret
-      valuesKey: "common"
-    - name: {{ .Release.Name }}-vault-values
-      kind: Secret
-      valuesKey: "defaults"
-    - name: {{ .Release.Name }}-vault-values
-      kind: Secret
-      valuesKey: "overlays"
-
-  # TODO: DRY this up
-  {{- if or .Values.gatekeeper.enabled .Values.istio.enabled }}
-  dependsOn:
-    {{- if .Values.gatekeeper.enabled }}
-    - name: gatekeeper
-      namespace: {{ .Release.Namespace }}
-    {{- end }}
-    {{- if .Values.istio.enabled }}
-    - name: istio
-      namespace: {{ .Release.Namespace }}
-    {{- end }}
-    {{- if .Values.monitoring.enabled }}
-    - name: monitoring
-      namespace: {{ .Release.Namespace }}
-    {{- end }}
-  {{- end }}
-{{- end }}
diff --git a/chart/templates/vault/values.yaml b/chart/templates/vault/values.yaml
index f65cfb1fdec6e9d8b3bd1d4f30cd8581655fd5ea..94114a3a808c3a331d708d60e2cfa51ae07a377a 100644
--- a/chart/templates/vault/values.yaml
+++ b/chart/templates/vault/values.yaml
@@ -25,13 +25,8 @@ global:
   imagePullSecrets:
   - name: private-registry
 
-networkPolicies:
-  enabled: {{ .Values.networkPolicies.enabled }}
-  ingressLabels:
-    {{- $gateway := default "public" .Values.twistlock.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 }}
+
+
 istio:
   enabled: {{ .Values.istio.enabled }}
   vault:
diff --git a/chart/templates/vault/vault-helmrelease.yaml b/chart/templates/vault/vault-helmrelease.yaml
index 0e55f56d212ee232f012e77c43527d58f31b806f..b4b4ad253b174d3ee917a0861b909aaa4a97bd52 100644
--- a/chart/templates/vault/vault-helmrelease.yaml
+++ b/chart/templates/vault/vault-helmrelease.yaml
@@ -1,5 +1,4 @@
 {{- $fluxSettingsVault := merge .Values.addons.vault.flux .Values.flux -}}
-
 {{- if .Values.addons.vault.enabled }}
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
@@ -46,4 +45,4 @@ spec:
       namespace: {{ .Release.Namespace }}
     {{- end }}
   {{- end }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/chart/values.yaml b/chart/values.yaml
index 61c0425de20055218ab57a9187ae54406002ef2a..e0ccf70f26e9a1c6eb979eea1b52c8e87bb59736 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -485,6 +485,21 @@ twistlock:
 # ----------------------------------------------------------------------------------------------------------------------
 #
 addons:
+  vault:
+    # -- Toggle deployment of Vault.
+    enabled: true
+    git:
+      repo: https://repo1.dso.mil/platform-one/big-bang/apps/sandbox/vault.git
+      path: "./chart"
+      branch: "deploy-vault"
+    # -- Flux reconciliation overrides specifically for the Twistlock Package
+    flux: {}
+    ingress:
+      gateway: ""
+    values: {}
+    postRenderers: []
+
+
   argocd:
     # -- Toggle deployment of ArgoCD.
     enabled: false
@@ -549,18 +564,6 @@ addons:
     # -- Additional authservice chain configurations.
     chains: {}
 
-  # ----------------------------------------------------------------------------------------------------------------------  
-  # Vault
- #
-  vault:
-  # -- Toggle deployment of vault.
-    enabled: true
-    git:
-      repo: https://repo1.dso.mil/platform-one/big-bang/apps/sandbox/vault.git
-      path: "./chart"
-      branch: "deploy-vault"
-  # ----------------------------------------------------------------------------------------------------------------------  
-
   # ----------------------------------------------------------------------------------------------------------------------
   # Minio Operator and Instance
   #
diff --git a/tests/test-values.yaml b/tests/test-values.yaml
index af31ca514056349783d7c92d47efd1a466b1840d..2cf474ba1282ecafa8e9285917ee0758420d31f9 100644
--- a/tests/test-values.yaml
+++ b/tests/test-values.yaml
@@ -360,6 +360,8 @@ twistlock:
 
 # Addons are toggled based on labels in CI
 addons:
+  vault:
+    enabled: true
   argocd:
     enabled: false
     sso: