diff --git a/chart/charts/gluon-0.4.7.tgz b/chart/charts/gluon-0.4.7.tgz
index 31c2ab3be03260087400af9a4aa8954e2669e936..956366622a7a0782833a17d6f4b2c9cd1c10b4ea 100644
Binary files a/chart/charts/gluon-0.4.7.tgz and b/chart/charts/gluon-0.4.7.tgz differ
diff --git a/chart/tests/cypress.config.js b/chart/tests/cypress.config.js
deleted file mode 100644
index f6425c8cfe4ddc343ba9231f982d7dca0bba15b5..0000000000000000000000000000000000000000
--- a/chart/tests/cypress.config.js
+++ /dev/null
@@ -1,14 +0,0 @@
-module.exports = {
-    defaultCommandTimeout: 12000,
-    screenshot: true,
-    screenshotOnRunFailure: true,
-    video: true,
-    videoCompression: 35,
-    e2e: {
-      supportFile: false,
-      testIsolation: false,
-      setupNodeEvents(on, config) {
-        // implement node event listeners here
-      },
-    },
-  };
\ No newline at end of file
diff --git a/chart/tests/cypress/e2e/02-grafana.cy.js b/chart/tests/cypress/e2e/02-grafana.cy.js
index 7148ee650857e2936fe929236e12f99e72c91cd5..223c42d6714d6101557e37faa0a28151f3ba9a27 100644
--- a/chart/tests/cypress/e2e/02-grafana.cy.js
+++ b/chart/tests/cypress/e2e/02-grafana.cy.js
@@ -1,15 +1,3 @@
-// Loads a dashboard and validates title
-Cypress.Commands.add('loaddashboard', (name) => {
-  cy.intercept('POST', '**/query*').as('apiQuery')
-  cy.get('input[placeholder="Search for dashboards and folders"]').type(name)
-  cy.get('a[title="' + name + '"]').click()
-  cy.wait('@apiQuery', {timeout: 30000}).then((interception) => {
-      expect(interception.response.statusCode).to.equal(200);
-  })
-  console.log('Loaded Dashboard for ' + name)
-  cy.get('title').contains(name)
-})
-
 // Validates panel data should not be zero
 Cypress.Commands.add('panelnotzero', (name) => {
   cy.get('[data-testid="data-testid Panel header ' + name + '"]')
@@ -19,12 +7,7 @@ Cypress.Commands.add('panelnotzero', (name) => {
 // Log in
 before (function() {
   cy.visit(Cypress.env('grafana_url'))
-  cy.get('input[name="user"]')
-    .type('admin')
-  cy.get('input[name="password"]')
-    .type('prom-operator')
-  cy.contains("Log in").click()
-  cy.get('.page-dashboard').contains('Welcome', {timeout: 30000})
+  cy.performGrafanaLogin(Cypress.env('grafana_user'), Cypress.env('grafana_pass'))
 })
 
 // Save cookies so we don't have to log in again
@@ -39,24 +22,23 @@ describe('Validate Grafana Dashboards', {
 }, () => {
   if (Cypress.env("check_datasource")) {
     it('Validate Cluster Policy Report Details Dashboard', () => {
-      cy.loaddashboard('ClusterPolicyReport Details')
+      cy.loadGrafanaDashboard("ClusterPolicyReport Details")
       cy.panelnotzero('Policy Pass Status')
       cy.panelnotzero('Policy Fail Status')
     })
     it('Validate Policy Report Details Dashboard', () => {
-      cy.loaddashboard('PolicyReport Details')
+      cy.loadGrafanaDashboard("PolicyReport Details")
       cy.panelnotzero('Policy Pass Status')
       cy.panelnotzero('Policy Fail Status')
     })
     it('Validate Policy Reports Dashboard', () => {
-      cy.loaddashboard('PolicyReports')
+      cy.loadGrafanaDashboard("PolicyReports")
       cy.panelnotzero('Failing ClusterPolicies')
-  
     })
   }
 })
 
 // Clear cookies to force login again
 after(() => {
-  Cypress.session.clearCurrentSessionData
+  cy.clearAllUserData()
 })
\ No newline at end of file
diff --git a/chart/values.yaml b/chart/values.yaml
index 228c527f880701234061feb3ef07b271a70b05ef..67706ce851bc387af4503f617d24ea7b4afaf194 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -770,5 +770,7 @@ bbtests:
     envs:
       cypress_grafana_url: http://grafana.monitoring.svc.cluster.local
       cypress_prometheus_url: http://monitoring-kube-prometheus-prometheus.monitoring.svc.cluster.local:9090
+      cypress_grafana_user: "admin"
+      cypress_grafana_pass: "prom-operator"
       cypress_reporter_ns: kyverno-reporter
   volumes: []