diff --git a/kubernetes/apps/cnpg-system/cloudnative-pg-dashboards/app/helmrelease.yaml b/kubernetes/apps/cnpg-system/cloudnative-pg-dashboards/app/helmrelease.yaml
new file mode 100644
index 00000000..5d65b4dc
--- /dev/null
+++ b/kubernetes/apps/cnpg-system/cloudnative-pg-dashboards/app/helmrelease.yaml
@@ -0,0 +1,33 @@
+---
+# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/ocirepository_v1beta2.json
+apiVersion: source.toolkit.fluxcd.io/v1beta2
+kind: OCIRepository
+metadata:
+  name: grafana-dashboards
+spec:
+  interval: 5m
+  layerSelector:
+    mediaType: application/vnd.cncf.helm.chart.content.v1.tar+gzip
+    operation: copy
+  ref:
+    tag: 0.0.3
+  url: oci://ghcr.io/cloudnative-pg/grafana-dashboards/cluster
+# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/helm.toolkit.fluxcd.io/helmrelease_v2.json
+---
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: cloudnative-pg-dashboards
+spec:
+  chartRef:
+    kind: OCIRepository
+    name: grafana-dashboards
+  maxHistory: 3
+  interval: 30m
+  uninstall:
+    keepHistory: false
+  values:
+    grafanaDashboard:
+      namespace: database
+      annotations:
+        grafana_folder: Storage
diff --git a/kubernetes/apps/cnpg-system/cloudnative-pg-dashboards/app/kustomization.yaml b/kubernetes/apps/cnpg-system/cloudnative-pg-dashboards/app/kustomization.yaml
new file mode 100644
index 00000000..17cbc72b
--- /dev/null
+++ b/kubernetes/apps/cnpg-system/cloudnative-pg-dashboards/app/kustomization.yaml
@@ -0,0 +1,6 @@
+---
+# yaml-language-server: $schema=https://json.schemastore.org/kustomization
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ./helmrelease.yaml
diff --git a/kubernetes/apps/cnpg-system/cloudnative-pg-dashboards/ks.yaml b/kubernetes/apps/cnpg-system/cloudnative-pg-dashboards/ks.yaml
new file mode 100644
index 00000000..e5bcc4da
--- /dev/null
+++ b/kubernetes/apps/cnpg-system/cloudnative-pg-dashboards/ks.yaml
@@ -0,0 +1,21 @@
+---
+# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/kustomize.toolkit.fluxcd.io/kustomization_v1.json
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: &app cloudnative-pg-dashboards
+  namespace: &namespace cnpg-system
+spec:
+  commonMetadata:
+    labels:
+      app.kubernetes.io/name: *app
+  interval: 30m
+  path: ./kubernetes/apps/cnpg-system/cloudnative-pg-dashboards/app/
+  prune: true
+  sourceRef:
+    kind: GitRepository
+    name: flux-system
+    namespace: flux-system
+  targetNamespace: *namespace
+  timeout: 5m
+  wait: false
diff --git a/kubernetes/apps/cnpg-system/kustomization.yaml b/kubernetes/apps/cnpg-system/kustomization.yaml
index eaddddbe..fd7ab4ea 100644
--- a/kubernetes/apps/cnpg-system/kustomization.yaml
+++ b/kubernetes/apps/cnpg-system/kustomization.yaml
@@ -5,6 +5,7 @@ kind: Kustomization
 namespace: cnpg-system
 resources:
   - ./cloudnative-pg/ks.yaml
+  - ./cloudnative-pg-dashboards/ks.yaml
 components:
   - ../../flux/components/alerts
   - ../../flux/components/namespace