diff --git a/chart/values.yaml b/chart/values.yaml
index 7c9b9db8816b899731c3f453aee4d5420fd1e359..4c79a2d710d40c7aca01ef2c7b7fe85552b189be 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -491,7 +491,7 @@ addons:
     git:
       repo: https://repo1.dso.mil/platform-one/big-bang/apps/core/argocd.git
       path: "./chart"
-      tag: "3.6.8-bb.11"
+      tag: "3.6.8-bb.12"
 
     # -- Flux reconciliation overrides specifically for the ArgoCD Package
     flux: {}
diff --git a/tests/test-values.yaml b/tests/test-values.yaml
index 932d308f89975d3c14643dd3fc3799f739ddf4d2..9a4b4449361e2fe65a1e67ff14685b38a6076455 100644
--- a/tests/test-values.yaml
+++ b/tests/test-values.yaml
@@ -135,6 +135,8 @@ gatekeeper:
           excludedResources:
           # Allows k3d load balancer containers to pull from public repos
           - istio-system/lb-port-.*
+          # Allow argocd to deploy a test app in its cypress test
+          - argocd/guestbook-ui.*
       allowedSecCompProfiles:
         parameters:
           excludedResources:
@@ -385,15 +387,15 @@ addons:
       redis-bb:
         master:
           persistence:
-            size: 256Mi
+            size: 512Mi
         replica:
           persistence:
-            size: 256Mi
+            size: 512Mi
       redis:
         resources:
           requests:
             cpu: 50m
-            memory: 64Mi
+            memory: 256Mi
           limits: {}
       server:
         resources:
@@ -411,9 +413,7 @@ addons:
         secret:
           argocdServerAdminPassword: '$2a$10$rUDZDckdDZ2TEwk9PDs3QuqjkL58qR1IHE1Kj4MwDx.7/m5dytZJm'
       bbtests:
-        # TODO: Disabled pending resolution of some "timing?" issues
-        # https://repo1.dso.mil/platform-one/big-bang/apps/core/argocd/-/issues/17
-        enabled: false
+        enabled: true
         cypress:
           artifacts: true
           envs: