diff --git a/chart/templates/vault/namespace.yaml b/chart/templates/vault/namespace.yaml
index f0d0a8a9d16b165732c5be2dc7e89a1e3e54274a..9a97a6ef3587ffdb4f0b20f882532b442deb0aa0 100644
--- a/chart/templates/vault/namespace.yaml
+++ b/chart/templates/vault/namespace.yaml
@@ -7,5 +7,5 @@ metadata:
     app.kubernetes.io/name: vault
     app.kubernetes.io/component: "security-tools"
     {{- include "commonLabels" . | nindent 4}}
-    istio-injection: {{ ternary "enabled" "disabled" (and .Values.istio.enabled (eq (dig "istio" "injection" "enabled" .Values.addons.vault) "enabled")) }}
+    istio-injection: {{ ternary "enabled" "disabled" (and (eq (include "istioEnabled" .) "true") (eq (dig "istio" "injection" "enabled" .Values.addons.vault) "enabled")) }}
 {{- end }}
diff --git a/chart/templates/vault/values.yaml b/chart/templates/vault/values.yaml
index 78d408eefab1bef1c84057dee9bf98423466f779..c94c7f81c9436a80e2c63231633b6e64ce292c2e 100644
--- a/chart/templates/vault/values.yaml
+++ b/chart/templates/vault/values.yaml
@@ -54,6 +54,8 @@ csi:
 
 networkPolicies:
   enabled: {{ .Values.networkPolicies.enabled }}
+  istioNamespaceSelector:
+  {{ include "istioNamespaceSelector" . | nindent 4 }}  
   ingressLabels:
     {{- $gateway := default "public" .Values.addons.vault.ingress.gateway }}
     {{- $default := dict "app" (dig "gateways" $gateway "ingressGateway" nil .Values.istio) "istio" nil }}
@@ -63,7 +65,7 @@ networkPolicies:
   vpcCidr: {{ .Values.networkPolicies.vpcCidr }}  
 
 istio:
-  enabled: {{ .Values.istio.enabled }}
+  enabled: {{ include "istioEnabled" . }}
   hardened:
     enabled: {{ or
       (dig "istio" "hardened" "enabled" false .Values.addons.vault.values)
@@ -71,7 +73,7 @@ istio:
     }}
   vault:
     gateways:
-      - istio-system/{{ default "public" .Values.addons.vault.ingress.gateway }}
+      - {{ include "istioGatewayNamespace" . }}/{{ default (include "istioPublicGateway" . ) .Values.addons.vault.ingress.gateway }}
     {{- if and .Values.addons.vault.ingress.cert .Values.addons.vault.ingress.key }}
     tls:
       cert: {{ .Values.addons.vault.ingress.cert | quote }}
diff --git a/chart/values.yaml b/chart/values.yaml
index 286aedd82cb2dbf705d244458f89986898f85114..03c96b434ec47247611a6362f3426f3a5d7b5b6f 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -1967,11 +1967,11 @@ addons:
     git:
       repo: https://repo1.dso.mil/big-bang/product/packages/vault.git
       path: "./chart"
-      tag: "0.29.1-bb.9"
+      tag: "0.29.1-bb.10"
     helmRepo:
       repoName: "registry1"
       chartName: "vault"
-      tag: "0.29.1-bb.9"
+      tag: "0.29.1-bb.10"
 
     # -- Flux reconciliation overrides specifically for the Vault Package
     flux: {}
diff --git a/docs/assets/scripts/developer/k3d_dev_run_batch12U b/docs/assets/scripts/developer/k3d_dev_run_batch12U
new file mode 100644
index 0000000000000000000000000000000000000000..aad20a05a4aa3668e7b18e5e04e71c719e42d1f6
--- /dev/null
+++ b/docs/assets/scripts/developer/k3d_dev_run_batch12U
@@ -0,0 +1,2 @@
+#!/bin/bash
+set -xue
diff --git a/docs/assets/scripts/developer/k3d_dev_run_batch755 b/docs/assets/scripts/developer/k3d_dev_run_batch755
new file mode 100644
index 0000000000000000000000000000000000000000..aad20a05a4aa3668e7b18e5e04e71c719e42d1f6
--- /dev/null
+++ b/docs/assets/scripts/developer/k3d_dev_run_batch755
@@ -0,0 +1,2 @@
+#!/bin/bash
+set -xue
diff --git a/docs/assets/scripts/developer/k3d_dev_run_batchVt9 b/docs/assets/scripts/developer/k3d_dev_run_batchVt9
new file mode 100644
index 0000000000000000000000000000000000000000..aad20a05a4aa3668e7b18e5e04e71c719e42d1f6
--- /dev/null
+++ b/docs/assets/scripts/developer/k3d_dev_run_batchVt9
@@ -0,0 +1,2 @@
+#!/bin/bash
+set -xue