diff --git a/chart/values.yaml b/chart/values.yaml
index 974b36b03ece0700b65b4665ed671e2dd0471479..2b3f0092ed801139f863eb0b32ca3d8733670f50 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -1059,7 +1059,7 @@ addons:
     git:
       repo: https://repo1.dso.mil/platform-one/big-bang/apps/security-tools/keycloak.git
       path: "./chart"
-      tag: "11.0.1-bb.7"
+      tag: "11.0.1-bb.8"
 
     database:
       # -- Hostname of a pre-existing database to use for Keycloak.
diff --git a/tests/ci/k3d/values.yaml b/tests/ci/k3d/values.yaml
index 8695cdaa670bed10b25250d5c9fc62a0ecb3075a..8b97c29f316c002918b737bb161f62ddffbff5a0 100644
--- a/tests/ci/k3d/values.yaml
+++ b/tests/ci/k3d/values.yaml
@@ -871,9 +871,59 @@ addons:
           memory: 16Mi
         limits: {}
       bbtests:
-        # TODO: Keycloak in CI not supported yet
-        enabled: false
+        enabled: true
         cypress:
           artifacts: true
           envs:
             cypress_url: "https://keycloak.bigbang.dev"
+            cypress_username: "admin"
+            cypress_password: "password"
+      # Custom dev secret configuration
+      secrets:
+        env:
+          stringData:
+            CUSTOM_REGISTRATION_CONFIG: /opt/jboss/keycloak/customreg.yaml
+            KEYCLOAK_IMPORT: /opt/jboss/keycloak/realm.json
+            X509_CA_BUNDLE: /etc/x509/https/cas.pem
+        certauthority:
+          stringData:
+            cas.pem: '{{ .Files.Get "resources/dev/dod_cas.pem" }}'
+        customreg:
+          stringData:
+            customreg.yaml: '{{ .Files.Get "resources/dev/baby-yoda.yaml" }}'
+        realm:
+          stringData:
+            realm.json: '{{ .Files.Get "resources/dev/baby-yoda.json" }}'
+      extraVolumes: |-
+        - name: certauthority
+          secret:
+            secretName: {{ include "keycloak.fullname" . }}-certauthority
+        - name: customreg
+          secret:
+            secretName: {{ include "keycloak.fullname" . }}-customreg
+        - name: realm
+          secret:
+            secretName: {{ include "keycloak.fullname" . }}-realm
+      extraVolumeMounts: |-
+        - name: certauthority
+          mountPath: /etc/x509/https/cas.pem
+          subPath: cas.pem
+          readOnly: true
+        - name: customreg
+          mountPath: /opt/jboss/keycloak/customreg.yaml
+          subPath: customreg.yaml
+          readOnly: true
+        - name: realm
+          mountPath: /opt/jboss/keycloak/realm.json
+          subPath: realm.json
+          readOnly: true
+      
+      extraVolumeMountsBigBang:
+        - name: tlscert
+          mountPath: /etc/x509/https/tls.crt
+          subPath: tls.crt
+          readOnly: true
+        - name: tlskey
+          mountPath: /etc/x509/https/tls.key
+          subPath: tls.key
+          readOnly: true
\ No newline at end of file