diff --git a/charts/enterprise/grafana/Chart.yaml b/charts/enterprise/grafana/Chart.yaml
index cca01e3f898..0025731c3c6 100644
--- a/charts/enterprise/grafana/Chart.yaml
+++ b/charts/enterprise/grafana/Chart.yaml
@@ -38,4 +38,4 @@ sources:
   - https://hub.docker.com/r/grafana/grafana
   - https://quay.io/kiwigrid/k8s-sidecar
 type: application
-version: 13.1.2
+version: 14.0.0
diff --git a/charts/enterprise/grafana/values.yaml b/charts/enterprise/grafana/values.yaml
index 88032171024..7d612fb2f2e 100644
--- a/charts/enterprise/grafana/values.yaml
+++ b/charts/enterprise/grafana/values.yaml
@@ -31,6 +31,18 @@ workload:
             GF_AUTH_LDAP_ENABLED: "false"
             GF_AUTH_LDAP_ALLOW_SIGN_UP: "false"
             GF_SERVER_HTTP_PORT: 3000
+            GF_DATABASE_TYPE: postgres
+            GF_DATABASE_NAME: "{{ .Values.cnpg.main.user }}"
+            GF_DATABASE_USER: "{{ .Values.cnpg.main.database }}"
+            GF_DATABASE_SSL_MODE: disable
+            GF_DATABASE_HOST:
+              secretKeyRef:
+                name: cnpg-main-urls
+                key: host
+            GF_DATABASE_PASSWORD:
+              secretKeyRef:
+                name: cnpg-main-user
+                key: password
           probes:
             liveness:
               path: "/api/health"
@@ -326,3 +338,9 @@ serviceAccount:
 
 podOptions:
   automountServiceAccountToken: true
+
+cnpg:
+  main:
+    enabled: true
+    user: grafana
+    database: grafana
\ No newline at end of file