diff --git a/chart/templates/kiali/grafana-auth-secret.yaml b/chart/templates/kiali/grafana-auth-secret.yaml
index 6e4133bbc8acebbb35244fec7fc62067fdba453d..48bdb407d4c6e89895fc8b63790da1f9a1c75395 100644
--- a/chart/templates/kiali/grafana-auth-secret.yaml
+++ b/chart/templates/kiali/grafana-auth-secret.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.kiali.enabled }}
+{{- if and .Values.kiali.enabled (dig "grafana" "enabled" true .Values.monitoring.values) }}
 apiVersion: v1
 kind: Secret
 metadata:
diff --git a/chart/templates/kiali/values.yaml b/chart/templates/kiali/values.yaml
index e5e46fc8f2928dcdb367062dd57fdf8e081b7029..900d159ed3a3024e60cb62016c88122e9c2d74b2 100644
--- a/chart/templates/kiali/values.yaml
+++ b/chart/templates/kiali/values.yaml
@@ -37,19 +37,23 @@ cr:
       {{- end }}
     external_services:
       grafana:
+        enabled: {{ dig "grafana" "enabled" true .Values.monitoring.values }}
         {{- $grafanaUrl := first (dig "istio" "grafana" "hosts" list .Values.monitoring.values) }}
         url: https://{{ tpl ($grafanaUrl | default (printf "%s.%s" "grafana" .Values.hostname)) . }}
+        {{- if (dig "grafana" "enabled" true .Values.monitoring.values) }}
         auth:
-        {{- if (dig "grafana" "admin" "existingSecret" "" .Values.monitoring.values) }}
+          {{- if (dig "grafana" "admin" "existingSecret" "" .Values.monitoring.values) }}
           {{- $userKey := (dig "grafana" "admin" "userKey" "admin-user" .Values.monitoring.values) }}
           {{- with lookup "v1" "Secret" "monitoring" .Values.monitoring.values.grafana.admin.existingSecret }}
           username: {{ (get .data $userKey | b64dec) | default "admin" }}
           {{- end }}
-        {{- else }}
+          {{- else }}
           username: {{ dig "grafana" "adminUser" "admin" .Values.monitoring.values }}
-        {{- end }}
+          {{- end }}
           password: "secret:grafana-auth:password"
+        {{- end }}
       tracing:
+        enabled: {{ .Values.jaeger.enabled }}
         {{- $tracingUrl := first (dig "istio" "jaeger" "hosts" list .Values.jaeger.values) }}
         url: https://{{ tpl ($tracingUrl | default (printf "%s.%s" "tracing" .Values.hostname)) . }}
       istio:
diff --git a/charter/packages/kiali/Architecture.md b/charter/packages/kiali/Architecture.md
index 2038ba484456840893bc33d37f1d4bc4a2251d82..57b9c2c73d240b24edb309c925b6cd546cc0d78d 100644
--- a/charter/packages/kiali/Architecture.md
+++ b/charter/packages/kiali/Architecture.md
@@ -31,6 +31,8 @@ graph LR
   end
 ```
 
+NOTE: Prometheus is required for Kiali to function properly; Jaeger and Grafana are optional (although all are part of Big Bang Core).
+
 ### Storage
 
 Kiali does not have any persistent storage, all data is accessed live/directly from Jaeger/Monitoring services.