diff --git a/chart/values.yaml b/chart/values.yaml
index 8ec2c91be20686bd26c7d3540558d4423ae448f2..3e959d589209e59b94d14877e6ff5e955ae9ae50 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -1356,11 +1356,11 @@ addons:
     git:
       repo: https://repo1.dso.mil/big-bang/product/packages/sonarqube.git
       path: "./chart"
-      tag: "8.0.1-bb.5"
+      tag: "8.0.1-bb.6"
     helmRepo:
       repoName: "registry1"
       chartName: "sonarqube"
-      tag: "8.0.1-bb.5"
+      tag: "8.0.1-bb.6"
 
     # -- Flux reconciliation overrides specifically for the Sonarqube Package
     flux: {}
diff --git a/tests/test-values.yaml b/tests/test-values.yaml
index 0586c8d0f7cd9b3b41e9e020df20179260ae06ec..f47a94457c1fb9fe2260e114b5be799a773891e3 100644
--- a/tests/test-values.yaml
+++ b/tests/test-values.yaml
@@ -1581,7 +1581,7 @@ addons:
             customreg.yaml: '{{ .Files.Get "resources/dev/baby-yoda.yaml" }}'
         realm:
           stringData:
-            realm.json: '{{ .Files.Get "resources/dev/baby-yoda.json" }}'
+            realm.json: '{{ .Files.Get "resources/dev/baby-yoda-bb-ci.json" }}'
         truststore:
           data:
             truststore.jks: |-