diff --git a/chart/templates/clusterauditor/values.yaml b/chart/templates/clusterauditor/values.yaml
index 4cf19c98b41de5f7d83734d0bf017f150a57c154..573407930054ff17cb2db9c1d12f363d9df8c0ff 100644
--- a/chart/templates/clusterauditor/values.yaml
+++ b/chart/templates/clusterauditor/values.yaml
@@ -6,4 +6,7 @@
 elasticsearch:
   imagePullSecrets:
     - name: private-registry
+
+istio:
+  enabled: {{ .Values.istio.enabled }}
 {{- end -}}
diff --git a/chart/templates/logging/fluentbit/values.yaml b/chart/templates/logging/fluentbit/values.yaml
index 1d15344d5fab464b4b192a313f756d23de1fe0fe..6988afc2e97a3b2aaa400d081cfbb5cf9b30730d 100644
--- a/chart/templates/logging/fluentbit/values.yaml
+++ b/chart/templates/logging/fluentbit/values.yaml
@@ -11,6 +11,26 @@ elasticsearch:
 imagePullSecrets:
   - name: private-registry
 
+{{- if .Values.monitoring.enabled }}
+serviceMonitor:
+  enabled: true
+  namespace: monitoring
+  interval: 10s
+  scrapeTimeout: 10s
+  selector:
+    prometheus: monitoring-monitoring-kube-prometheus
+
+dashboards:
+  enabled: true
+  labelKey: grafana_dashboard
+  namespace: monitoring
+{{- end }}
+
+{{- if .Values.istio.enabled }}
+podLabels:
+  traffic.sidecar.istio.io/excludeOutboundPorts: "443"
+{{- end }}
+
 {{- if .Values.openshift }}
 podSecurityContext:
   seLinuxOptions:
diff --git a/chart/values.yaml b/chart/values.yaml
index 2442afe6f97d9ba6cdd9f5a3f56591f04988324c..aecae6688b0925c6613cd0dfbdcaa8a059324d9f 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -172,7 +172,7 @@ logging:
   git:
     repo: https://repo1.dso.mil/platform-one/big-bang/apps/core/elasticsearch-kibana.git
     path: "./chart"
-    tag: "0.1.4-bb.4"
+    tag: "0.1.7-bb.0"
 
   sso:
     # -- Toggle OIDC SSO for Kibana/Elasticsearch on and off.
@@ -210,7 +210,7 @@ fluentbit:
   git:
     repo: https://repo1.dso.mil/platform-one/big-bang/apps/core/fluentbit.git
     path: "./chart"
-    tag: "0.7.10-bb.0"
+    tag: "0.15.3-bb.0"
   values: {}
 # ----------------------------------------------------------------------------------------------------------------------