diff --git a/tests/eks-test-values.yaml b/tests/eks-test-values.yaml
index 7f92e8ace94439ccfa74d2f2573514acfeb24852..778ce8907790528d0edc1ebf4654a7cec64f95a8 100644
--- a/tests/eks-test-values.yaml
+++ b/tests/eks-test-values.yaml
@@ -16,6 +16,9 @@ istio:
       proxyMetadata:
         ISTIO_META_DNS_CAPTURE: "true"
         ISTIO_META_DNS_AUTO_ALLOCATE: "true"
+    bbtests:
+      cypress:
+        artifacts: false
 
 neuvector:
   values:
@@ -23,6 +26,9 @@ neuvector:
       enabled: false
     containerd:
       enabled: true
+    bbtests:
+      cypress:
+        artifacts: false
 
 clusterAuditor:
   values:
@@ -31,6 +37,9 @@ clusterAuditor:
         cpu: 300m
         memory: 300Mi
       limits: null
+    bbtests:
+      cypress:
+        artifacts: false
     
 gatekeeper:
   values:
@@ -41,6 +50,9 @@ gatekeeper:
         requests:
           cpu: 175m
           memory: 512Mi
+    bbtests:
+      cypress:
+        artifacts: false
 
 kyverno:
   values:
@@ -50,9 +62,15 @@ kyverno:
       requests:
         cpu: 500m
         memory: 384Mi
+    bbtests:
+      cypress:
+        artifacts: false
 
 elasticsearchKibana:
   values:
+    bbtests:
+      cypress:
+        artifacts: false
     elasticsearch:
       master:
         count: 1
@@ -73,6 +91,9 @@ elasticsearchKibana:
 
 loki:
   values:
+    bbtests:
+      cypress:
+        artifacts: false
     loki-simple-scalable:
       write:
         resources:
@@ -83,6 +104,9 @@ loki:
 
 tempo:
   values:
+    bbtests:
+      cypress:
+        artifacts: false
     tempo:
       resources:
         limits: null
@@ -106,6 +130,9 @@ tempo:
 
 monitoring:
   values:
+    bbtests:
+      cypress:
+        artifacts: false
     prometheus:
       prometheusSpec:
         additionalScrapeConfigs: []
@@ -146,14 +173,38 @@ monitoring:
 
 twistlock:
   values:
+    bbtests:
+      cypress:
+        artifacts: false
     console:
       persistence:
         size: 5Gi
 
+jaeger:
+  values:
+    bbtests:
+      cypress:
+        artifacts: false
+
+kiali:
+  values:
+    bbtests:
+      cypress:
+        artifacts: false
+
+grafana:
+  values:
+    bbtests:
+      cypress:
+        artifacts: false
+
 # Addons are toggled based on labels in CI
 addons:
   argocd:
     values:
+      bbtests:
+        cypress:
+          artifacts: false
       controller:
         resources:
           requests:
@@ -194,6 +245,9 @@ addons:
 
   authservice:
     values:
+      bbtests:
+        cypress:
+          artifacts: false
       resources:
         requests:
           cpu: 100m
@@ -211,6 +265,9 @@ addons:
     flux:
       timeout: 30m
     values:
+      bbtests:
+        cypress:
+          artifacts: false
       gitlab-runner:
         resources:
           requests:
@@ -271,6 +328,9 @@ addons:
 
   gitlabRunner:
     values:
+      bbtests:
+        cypress:
+          artifacts: false
       resources:
         requests:
           memory: 128Mi
@@ -279,6 +339,9 @@ addons:
 
   anchore:
     values:
+      bbtests:
+        cypress:
+          artifacts: false
       ensureDbJobs:
         resources:
           requests:
@@ -403,6 +466,9 @@ addons:
     
   sonarqube:
     values:
+      bbtests:
+        cypress:
+          artifacts: false
       resources:
         requests:
           cpu: 200m
@@ -421,6 +487,9 @@ addons:
 
   minio:
     values:
+      bbtests:
+        cypress:
+          artifacts: false
       tenant:
         pools:
         - servers: 3
@@ -443,6 +512,9 @@ addons:
 
   mattermost:
     values:
+      bbtests:
+        cypress:
+          artifacts: false
       postgresql:
         persistence:
           size: 256Mi
@@ -474,6 +546,9 @@ addons:
             
   nexusRepositoryManager:
     values:
+      bbtests:
+        cypress:
+          artifacts: false
       persistence:
         # Do NOT set this below 5Gi, nexus will fail to boot
         storageSize: 5Gi
@@ -486,9 +561,35 @@ addons:
   
   keycloak:
     values:
+      bbtests:
+        cypress:
+          artifacts: false
       resources:
         requests:
           cpu: 100m
           memory: 256Mi
         limits: null
 
+  harbor:
+    values:
+      bbtests:
+        cypress:
+          artifacts: false
+    
+  holocron:
+    values:
+      bbtests:
+        cypress:
+          artifacts: false
+
+  fortify:
+    values:
+      bbtests:
+        cypress:
+          artifacts: false
+
+  minioOperator:
+    values:
+      bbtests:
+        cypress:
+          artifacts: false
\ No newline at end of file
diff --git a/tests/rke2-test-values.yaml b/tests/rke2-test-values.yaml
index e6fb626613a1f2cebd9bf5cd2d1eca0e11b19ca3..369e0ad97a23b9547c649877ac877b516a0ae857 100644
--- a/tests/rke2-test-values.yaml
+++ b/tests/rke2-test-values.yaml
@@ -16,6 +16,9 @@ istio:
 
 clusterAuditor:
   values:
+    bbtests:
+      cypress:
+        artifacts: false
     resources:
       requests:
         cpu: 300m
@@ -24,6 +27,9 @@ clusterAuditor:
     
 gatekeeper:
   values:
+    bbtests:
+      cypress:
+        artifacts: false
     replicas: 1
     controllerManager:
       resources:
@@ -34,6 +40,9 @@ gatekeeper:
 
 kyverno:
   values:
+    bbtests:
+      cypress:
+        artifacts: false
     networkPolicies:
       externalRegistries:
         allowEgress: true
@@ -46,6 +55,9 @@ kyverno:
 
 elasticsearchKibana:
   values:
+    bbtests:
+      cypress:
+        artifacts: false
     elasticsearch:
       master:
         count: 1
@@ -66,6 +78,9 @@ elasticsearchKibana:
 
 loki:
   values:
+    bbtests:
+      cypress:
+        artifacts: false
     loki-simple-scalable:
       write:
         resources:
@@ -76,6 +91,9 @@ loki:
 
 tempo:
   values:
+    bbtests:
+      cypress:
+        artifacts: false
     tempo:
       resources:
         limits: null
@@ -99,6 +117,9 @@ tempo:
 
 monitoring:
   values:
+    bbtests:
+      cypress:
+        artifacts: false
     prometheus:
       prometheusSpec:
         additionalScrapeConfigs: []
@@ -134,14 +155,38 @@ monitoring:
 
 twistlock:
   values:
+    bbtests:
+      cypress:
+        artifacts: false
     console:
       persistence:
         size: 5Gi
 
+jaeger:
+  values:
+    bbtests:
+      cypress:
+        artifacts: false
+
+kiali:
+  values:
+    bbtests:
+      cypress:
+        artifacts: false
+
+grafana:
+  values:
+    bbtests:
+      cypress:
+        artifacts: false
+
 # Addons are toggled based on labels in CI
 addons:
   argocd:
     values:
+      bbtests:
+        cypress:
+          artifacts: false
       controller:
         resources:
           requests:
@@ -182,6 +227,9 @@ addons:
 
   authservice:
     values:
+      bbtests:
+        cypress:
+          artifacts: false
       resources:
         requests:
           cpu: 100m
@@ -199,6 +247,9 @@ addons:
     flux:
       timeout: 30m
     values:
+      bbtests:
+        cypress:
+          artifacts: false
       gitlab-runner:
         resources:
           requests:
@@ -259,6 +310,9 @@ addons:
 
   gitlabRunner:
     values:
+      bbtests:
+        cypress:
+          artifacts: false
       resources:
         requests:
           memory: 128Mi
@@ -267,6 +321,9 @@ addons:
 
   anchore:
     values:
+      bbtests:
+        cypress:
+          artifacts: false
       ensureDbJobs:
         resources:
           requests:
@@ -391,6 +448,9 @@ addons:
     
   sonarqube:
     values:
+      bbtests:
+        cypress:
+          artifacts: false
       resources:
         requests:
           cpu: 200m
@@ -409,6 +469,9 @@ addons:
 
   minio:
     values:
+      bbtests:
+        cypress:
+          artifacts: false
       tenant:
         pools:
         - servers: 3
@@ -431,6 +494,9 @@ addons:
 
   mattermost:
     values:
+      bbtests:
+        cypress:
+          artifacts: false
       postgresql:
         persistence:
           size: 256Mi
@@ -462,6 +528,9 @@ addons:
             
   nexusRepositoryManager:
     values:
+      bbtests:
+        cypress:
+          artifacts: false
       persistence:
         # Do NOT set this below 5Gi, nexus will fail to boot
         storageSize: 5Gi
@@ -474,9 +543,36 @@ addons:
   
   keycloak:
     values:
+      bbtests:
+        cypress:
+          artifacts: false
       resources:
         requests:
           cpu: 100m
           memory: 256Mi
         limits: null
+
+  harbor:
+    values:
+      bbtests:
+        cypress:
+          artifacts: false
+    
+  holocron:
+    values:
+      bbtests:
+        cypress:
+          artifacts: false
+
+  fortify:
+    values:
+      bbtests:
+        cypress:
+          artifacts: false
+
+  minioOperator:
+    values:
+      bbtests:
+        cypress:
+          artifacts: false