diff --git a/chart/values.yaml b/chart/values.yaml
index 9b5e6f08f2e16803a2d476ec8e5e7363d4d3addc..250cd9393cb4e5d770aca63e27200bacfa91b01c 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -933,11 +933,11 @@ grafana:
   git:
     repo: https://repo1.dso.mil/big-bang/product/packages/grafana.git
     path: "./chart"
-    tag: "8.3.6-bb.0"
+    tag: "8.3.6-bb.1"
   helmRepo:
     repoName: "registry1"
     chartName: "grafana"
-    tag: "8.3.6-bb.0"
+    tag: "8.3.6-bb.1"
 
   # -- Flux reconciliation overrides specifically for the Monitoring Package
   flux: {}
diff --git a/tests/test-values.yaml b/tests/test-values.yaml
index 439ca7513b642057979b709fc9fbd983588cb440..c1c3f3ca4ff57f115bbd6edcd4cbf88a5d1f4664 100644
--- a/tests/test-values.yaml
+++ b/tests/test-values.yaml
@@ -1112,9 +1112,7 @@ monitoring:
           cypress_tnr_password: "tnr_w!G33ZyAt@C8"
 
 grafana:
-  enabled: true
   sso:
-    enabled: false
     grafana:
       client_id: dev_00eb8904-5b88-4c68-ad67-cec0d2e07aa6_grafana
       scopes: "openid Grafana"