diff --git a/CHANGELOG.md b/CHANGELOG.md
index f2a42ae23cb582ab4e06d3c98d4bba7308c6d335..2de34ddede3923da5d47cd7f216463da0b93849d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 Format: [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
+## [2.21.6-bb.2] - 2024-02-02
+### Changed
+- Updated to Gluon 0.4.7
+- Removed cypress config as it is now coming from gluon
+- Updated cypress tests to use new shared commands from gluon
+
 ## [2.21.6-bb.1] - 2024-01-25
 ### Changed
 - Changed cypress tests to work with version of Grafana
diff --git a/README.md b/README.md
index d0ee8fd1a4a3361b80f1d12125169683ccc37eca..e1f2e5d08f8aab83847a70b7e1e7c33461d312de 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # kyverno-reporter
 
-![Version: 2.21.6-bb.1](https://img.shields.io/badge/Version-2.21.6--bb.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.17.5](https://img.shields.io/badge/AppVersion-2.17.5-informational?style=flat-square)
+![Version: 2.21.6-bb.2](https://img.shields.io/badge/Version-2.21.6--bb.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.17.5](https://img.shields.io/badge/AppVersion-2.17.5-informational?style=flat-square)
 
 Policy Reporter watches for PolicyReport Resources.
 It creates Prometheus Metrics and can send rule validation events to different targets like Loki, Elasticsearch, Slack or Discord
@@ -337,6 +337,8 @@ helm install kyverno-reporter chart/
 | bbtests.cypress.artifacts | bool | `true` |  |
 | bbtests.cypress.envs.cypress_grafana_url | string | `"http://grafana.monitoring.svc.cluster.local"` |  |
 | bbtests.cypress.envs.cypress_prometheus_url | string | `"http://monitoring-kube-prometheus-prometheus.monitoring.svc.cluster.local:9090"` |  |
+| bbtests.cypress.envs.cypress_grafana_user | string | `"admin"` |  |
+| bbtests.cypress.envs.cypress_grafana_pass | string | `"prom-operator"` |  |
 | bbtests.cypress.envs.cypress_reporter_ns | string | `"kyverno-reporter"` |  |
 | bbtests.volumes | list | `[]` |  |
 
diff --git a/chart/Chart.yaml b/chart/Chart.yaml
index 287e4b5270b20fb685a7fd0314365c241d035488..71e4a857e41f2774ca6f03315c7e867d94479f6b 100644
--- a/chart/Chart.yaml
+++ b/chart/Chart.yaml
@@ -5,7 +5,7 @@ description: |
   It creates Prometheus Metrics and can send rule validation events to different targets like Loki, Elasticsearch, Slack or Discord
 
 type: application
-version: 2.21.6-bb.1
+version: 2.21.6-bb.2
 appVersion: 2.17.5
 
 icon: https://github.com/kyverno/kyverno/raw/main/img/logo.png
diff --git a/chart/tests/cypress/e2e/01-prometheus.cy.js b/chart/tests/cypress/e2e/01-prometheus.cy.js
index 9ed893509732ea792f0d7b9abfb4863d49fa0787..44784bc64bfc1281a2f8e88175da38bad2f0369e 100644
--- a/chart/tests/cypress/e2e/01-prometheus.cy.js
+++ b/chart/tests/cypress/e2e/01-prometheus.cy.js
@@ -7,5 +7,6 @@ describe('Prometheus Targets', {
 }, () => {
     it('Validate metrics are scraped', () => {
       cy.visit(`${Cypress.env('prometheus_url')}/targets`)
+      cy.validatePromTarget(Cypress.env('reporter_ns'), "(1/1 up)")
     })
 })
\ No newline at end of file