diff --git a/charts/policy-reporter/Chart.yaml b/charts/policy-reporter/Chart.yaml
index a1bb75e3..2af7c3c9 100644
--- a/charts/policy-reporter/Chart.yaml
+++ b/charts/policy-reporter/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: 3.0.0-rc.7
+version: 3.0.0-rc.8
 appVersion: 3.0.0-rc.3
 
 icon: https://github.com/kyverno/kyverno/raw/main/img/logo.png
diff --git a/charts/policy-reporter/README.md b/charts/policy-reporter/README.md
index 66adc4b0..12bc412b 100644
--- a/charts/policy-reporter/README.md
+++ b/charts/policy-reporter/README.md
@@ -3,7 +3,7 @@
 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
 
-![Version: 3.0.0-rc.7](https://img.shields.io/badge/Version-3.0.0--rc.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.0.0-rc.3](https://img.shields.io/badge/AppVersion-3.0.0--rc.3-informational?style=flat-square)
+![Version: 3.0.0-rc.8](https://img.shields.io/badge/Version-3.0.0--rc.8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.0.0-rc.3](https://img.shields.io/badge/AppVersion-3.0.0--rc.3-informational?style=flat-square)
 
 ## Documentation
 
diff --git a/charts/policy-reporter/templates/cluster-secret.yaml b/charts/policy-reporter/templates/cluster-secret.yaml
index 7ca7c347..b82ff064 100644
--- a/charts/policy-reporter/templates/cluster-secret.yaml
+++ b/charts/policy-reporter/templates/cluster-secret.yaml
@@ -14,6 +14,8 @@ data:
   {{- $username := .Values.basicAuth.username }}
   {{- $password := .Values.basicAuth.password }}
   host: {{ printf "http://%s:%d" (include "policyreporter.fullname" .) (.Values.service.port | int) | b64enc }}
+  username: {{ $username | b64enc }}
+  password: {{ $password | b64enc }}
   {{- if .Values.plugin.kyverno.enabled }}
   {{- $host := printf "http://%s:%d" (include "kyverno-plugin.fullname" .) (.Values.plugin.kyverno.service.port | int) }}
   plugin.kyverno: {{ (printf "{\"host\":\"%s\", \"name\":\"kyverno\", \"username\":\"%s\", \"password\":\"%s\"}" $host $username $password) | b64enc }}
@@ -21,6 +23,4 @@ data:
   {{- if .Values.plugin.trivy.enabled }}
   {{- $host := printf "http://%s:%d/vulnr" (include "trivy-plugin.fullname" .) (.Values.plugin.trivy.service.port | int) }}
   plugin.trivy: {{ (printf "{\"host\":\"%s\", \"name\":\"Trivy Vulnerability\", \"username\":\"%s\", \"password\":\"%s\"}" $host $username $password) | b64enc }}
-  username: {{ $username | b64enc }}
-  password: {{ $password | b64enc }}
   {{- end }}
\ No newline at end of file