diff --git a/chart/values.yaml b/chart/values.yaml
index b5866a1b098e984362d891d72fb6cecf040a8e44..50864341c0dad0983e4eaacb01daed6737c6cad5 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -1454,7 +1454,7 @@ addons:
     git:
       repo: https://repo1.dso.mil/platform-one/big-bang/apps/sandbox/metrics-server.git
       path: "./chart"
-      tag: "3.8.0-bb.4"
+      tag: "3.8.0-bb.5"
 
     # -- Flux reconciliation overrides specifically for the metrics server Package
     flux: {}
diff --git a/tests/test-values.yaml b/tests/test-values.yaml
index cf76e2ee1f96bbbe623d9b2829276db57389b6ab..914100cfe325c2da9ec7e95eb39987095cd9e068 100644
--- a/tests/test-values.yaml
+++ b/tests/test-values.yaml
@@ -1505,3 +1505,5 @@ addons:
     enabled: false
     values:
       replicas: 1
+      bbtests:
+        enabled: true