diff --git a/chart/templates/logging/elasticsearch-kibana/values.yaml b/chart/templates/logging/elasticsearch-kibana/values.yaml
index 23fc2dcf9c91194d5c66e828ebde34f0216fb5f2..1c84829b064d1f986ae9aa6c820198bac6b8b13a 100644
--- a/chart/templates/logging/elasticsearch-kibana/values.yaml
+++ b/chart/templates/logging/elasticsearch-kibana/values.yaml
@@ -42,12 +42,10 @@ sso:
 {{- end }}
 
 kibana:
-  version: 7.9.2
   imagePullSecrets:
     - name: private-registry
 
 elasticsearch:
-  version: 7.9.2
   imagePullSecrets:
     - name: private-registry
 {{- end -}}
diff --git a/chart/values.yaml b/chart/values.yaml
index f73e879b5703b009112497378480ece11afa73c3..6aef70b81675c4c420cfaba22d1f5ff70bf960ac 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -242,7 +242,7 @@ logging:
   git:
     repo: https://repo1.dso.mil/platform-one/big-bang/apps/core/elasticsearch-kibana.git
     path: "./chart"
-    tag: "0.1.10-bb.2"
+    tag: "0.1.11-bb.0"
 
   # -- Flux reconciliation overrides specifically for the Logging (EFK) Package
   flux:
diff --git a/scripts/deploy/02_wait_for_helmreleases.sh b/scripts/deploy/02_wait_for_helmreleases.sh
index ae1e93b69e930ab7dfa7977c2b74baef0a574149..6ff1330fd3851253ec6aa88bd6d2fea81e7163f1 100755
--- a/scripts/deploy/02_wait_for_helmreleases.sh
+++ b/scripts/deploy/02_wait_for_helmreleases.sh
@@ -96,11 +96,17 @@ do
   fi
 done
 
+# Double check everything got waited on...
+kubectl wait --for=condition=Ready --timeout 600s helmrelease -n bigbang --all
+
 echo "Waiting on Secrets Kustomization"
 kubectl wait --for=condition=Ready --timeout 300s kustomizations.kustomize.toolkit.fluxcd.io -n bigbang secrets
 
 # In case some helm releases are marked as ready before all objects are live...
-echo "Waiting on all deployments, statefulsets, and daemonsets"
+echo "Waiting on all jobs, deployments, statefulsets, and daemonsets"
 kubectl wait --for=condition=available --timeout 600s -A deployment --all > /dev/null
 wait_sts
 wait_daemonset
+if kubectl get job -A -o jsonpath='{.items[].metadata.name}' &> /dev/null; then
+  kubectl wait --for=condition=complete --timeout 300s -A job --all > /dev/null
+fi
diff --git a/tests/ci/k3d/values.yaml b/tests/ci/k3d/values.yaml
index 1e52d16e04da5748d34d37bbca6be10f493eae8a..974bb7ff9fcb14f71fd9c05071e3a1ace13f9795 100644
--- a/tests/ci/k3d/values.yaml
+++ b/tests/ci/k3d/values.yaml
@@ -18,13 +18,15 @@ logging:
             cpu: .5
           limits: {}
       data:
-        count: 1
+        count: 2
         persistence:
           size: 5Gi
         resources:
           requests:
             cpu: .5
           limits: {}
+    kibana:
+      count: 1
 
 fluentbit:
   values: