diff --git a/chart/templates/keycloak/values.yaml b/chart/templates/keycloak/values.yaml
index 883ac9f8a46d97c2515fca5c6c2fc4bfff5288b3..a7d6767a4b954942a830eb649572d859989ebfbc 100644
--- a/chart/templates/keycloak/values.yaml
+++ b/chart/templates/keycloak/values.yaml
@@ -38,6 +38,12 @@ podAnnotations:
   {{ include "istioAnnotation" . }}
 {{- end }}
 
+{{- if .Values.kiali.enabled }}
+podLabels:
+  {{- include "kialiAppLabel" . | nindent 2 }}
+  {{- include "kialiVersionLabel" . | nindent 2 }}
+{{- end }}
+
 networkPolicies:
   enabled: {{ .Values.networkPolicies.enabled }}
   controlPlaneCidr: {{ .Values.networkPolicies.controlPlaneCidr }}
@@ -64,12 +70,28 @@ serviceMonitor:
 {{- if .Values.addons.keycloak.database.host }}
 postgresql:
   enabled: false
-{{- else if $istioInjection }}
+{{- else if or $istioInjection .Values.kiali.enabled }}
 postgresql:
   primary:
-    {{ include "istioAnnotation" . }}
+    {{- if $istioInjection }}
+    annotations:
+      {{- include "istioAnnotation" . | nindent 6 }}
+    {{- end }}
+    {{- if .Values.kiali.enabled }}
+    podLabels:
+      {{- include "kialiAppLabel" . | nindent 6 }}
+      {{- include "kialiVersionLabel" . | nindent 6 }}
+    {{- end }}
   readReplicas:
-    {{ include "istioAnnotation" . }}
+    {{- if $istioInjection }}
+    annotations:
+      {{- include "istioAnnotation" . | nindent 6 }}
+    {{- end }}
+    {{- if .Values.kiali.enabled }}
+    podLabels:
+      {{- include "kialiAppLabel" . | nindent 6 }}
+      {{- include "kialiVersionLabel" . | nindent 6 }}
+    {{- end }}
 {{- end }}
 
 {{- if or .Values.addons.keycloak.database.host (and .Values.addons.keycloak.ingress.cert .Values.addons.keycloak.ingress.key) }}
diff --git a/chart/values.yaml b/chart/values.yaml
index eb530c5182003c919fcd0838b8605732a088673b..23673ea127ee259a0011861370eeda9965d10910 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -1778,11 +1778,11 @@ addons:
     git:
       repo: https://repo1.dso.mil/big-bang/product/packages/keycloak.git
       path: "./chart"
-      tag: "2.4.3-bb.4"
+      tag: "2.4.3-bb.5"
     helmRepo:
       repoName: "registry1"
       chartName: "keycloak"
-      tag: "2.4.3-bb.4"
+      tag: "2.4.3-bb.5"
 
     database:
       # -- Hostname of a pre-existing database to use for Keycloak.