diff --git a/chart/templates/eck-operator/values.yaml b/chart/templates/eck-operator/values.yaml
index a3fbf5c7db8d96bde842260c1e9e0992d17dbd28..832b7e4360dc82733620336c7738c4783d08c2b1 100644
--- a/chart/templates/eck-operator/values.yaml
+++ b/chart/templates/eck-operator/values.yaml
@@ -18,12 +18,6 @@ podAnnotations:
   {{ include "istioAnnotation" . }}
 {{- end }}
 
-{{- if .Values.kiali.enabled }}
-podLabels:
-  {{- include "kialiAppLabel" . | nindent 2 }}
-  {{- include "kialiVersionLabel" . | nindent 2 }}
-{{- end }}
-
 openshift: {{ .Values.openshift }}
 
 istio:
diff --git a/chart/templates/elasticsearch-kibana/values.yaml b/chart/templates/elasticsearch-kibana/values.yaml
index b1d7299e16b76e7a05baa03e5a3e984032c94f7a..dc96bc58c15b03b83fff4b3e1fabb1b0d82b9ea8 100644
--- a/chart/templates/elasticsearch-kibana/values.yaml
+++ b/chart/templates/elasticsearch-kibana/values.yaml
@@ -83,11 +83,6 @@ kibana:
   podAnnotations:
     {{ include "istioAnnotation" . }}
 {{- end }}
-  {{- if .Values.kiali.enabled }}
-  podLabels:
-    {{- include "kialiAppLabel" . | nindent 4 }}
-    {{- include "kialiVersionLabel" . | nindent 4 }}
-  {{- end }}
 
 {{- if not .Values.elasticsearchKibana.serviceAccountAnnotations.kibana }}
   serviceAccountAnnotations: {}
@@ -99,10 +94,6 @@ monitoring:
 
 metrics:
   enabled: {{ .Values.monitoring.enabled }}
-  {{- if .Values.kiali.enabled }}
-  podLabels:
-    {{- include "kialiVersionLabel" . | nindent 4 }}
-  {{- end }}
   {{- $istioInjection := (and (eq (dig "istio" "injection" "enabled" .Values.elasticsearchKibana) "enabled") .Values.istio.enabled) }}
   {{- if and (eq (dig "istio" "mtls" "mode" "STRICT" .Values.elasticsearchKibana.values) "STRICT") $istioInjection }}
   serviceMonitor:
@@ -118,11 +109,6 @@ elasticsearch:
   imagePullSecrets:
     - name: private-registry
   master:
-    {{- if .Values.kiali.enabled }}
-    podLabels:
-      {{- include "kialiAppLabel" . | nindent 6 }}
-      {{- include "kialiVersionLabel" . | nindent 6 }}
-    {{- end }}
     initContainers:
       - name: elastic-internal-init-filesystem
         securityContext:
@@ -149,11 +135,6 @@ elasticsearch:
       {{ include "istioAnnotation" . }}
     {{- end }}
   data:
-    {{- if .Values.kiali.enabled }}
-    podLabels:
-      {{- include "kialiAppLabel" . | nindent 6 }}
-      {{- include "kialiVersionLabel" . | nindent 6 }}
-    {{- end }}
     initContainers:
       - name: elastic-internal-init-filesystem
         securityContext:
@@ -180,11 +161,6 @@ elasticsearch:
       {{ include "istioAnnotation" . }}
     {{- end }}
   ingest:
-    {{- if .Values.kiali.enabled }}
-    podLabels:
-      {{- include "kialiAppLabel" . | nindent 6 }}
-      {{- include "kialiVersionLabel" . | nindent 6 }}
-    {{- end }}
     initContainers:
       - name: elastic-internal-init-filesystem
         securityContext:
@@ -211,11 +187,6 @@ elasticsearch:
       {{ include "istioAnnotation" . }}
     {{- end }}
   ml:
-    {{- if .Values.kiali.enabled }}
-    podLabels:
-      {{- include "kialiAppLabel" . | nindent 6 }}
-      {{- include "kialiVersionLabel" . | nindent 6 }}
-    {{- end }}
     initContainers:
       - name: elastic-internal-init-filesystem
         securityContext:
@@ -242,11 +213,6 @@ elasticsearch:
       {{ include "istioAnnotation" . }}
     {{- end }}
   coord:
-    {{- if .Values.kiali.enabled }}
-    podLabels:
-      {{- include "kialiAppLabel" . | nindent 6 }}
-      {{- include "kialiVersionLabel" . | nindent 6 }}
-    {{- end }}
     initContainers:
       - name: elastic-internal-init-filesystem
         securityContext:
diff --git a/chart/templates/sonarqube/values.yaml b/chart/templates/sonarqube/values.yaml
index 8299cb93af18b11049d1dbe3db2771aba1e3dd0e..e73f6b0f4169494fa7f5c8ec0fd9cd9ef8072706 100644
--- a/chart/templates/sonarqube/values.yaml
+++ b/chart/templates/sonarqube/values.yaml
@@ -101,11 +101,5 @@ postgresql:
     port: {{ .port }}
   {{- end }}
 {{- end }}
-
-{{- if .Values.kiali.enabled }}
-podLabels:
-  {{- include "kialiVersionLabel" . | nindent 2 }}
-{{- end }}
-
 {{- end -}}
 
diff --git a/chart/values.yaml b/chart/values.yaml
index 859eb23bb6affb6054cbcc0aafc982f56191f5b1..8d046f1852a5c85bbab69c1b261ef853da486882 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -1398,11 +1398,11 @@ addons:
     git:
       repo: https://repo1.dso.mil/big-bang/product/packages/sonarqube.git
       path: "./chart"
-      tag: "10.6.1-bb.1"
+      tag: "10.6.1-bb.2"
     helmRepo:
       repoName: "registry1"
       chartName: "sonarqube"
-      tag: "10.6.1-bb.1"
+      tag: "10.6.1-bb.2"
 
     # -- Flux reconciliation overrides specifically for the Sonarqube Package
     flux: {}