diff --git a/cloudnative-pg/Chart.yaml b/cloudnative-pg/Chart.yaml
new file mode 100644
index 0000000..62df605
--- /dev/null
+++ b/cloudnative-pg/Chart.yaml
@@ -0,0 +1,9 @@
+apiVersion: v2
+name: cloudnative-pg
+version: 0.23.0
+type: application
+dependencies:
+  - name: cloudnative-pg
+    version: ~0.23.0
+    repository: "https://cloudnative-pg.github.io/charts"
+    alias: app
diff --git a/cloudnative-pg/values.yaml b/cloudnative-pg/values.yaml
new file mode 100644
index 0000000..908d936
--- /dev/null
+++ b/cloudnative-pg/values.yaml
@@ -0,0 +1,6 @@
+app:
+  crds:
+    create: true
+  config:
+    data:
+      WATCH_NAMESPACE: "system-grafana"
diff --git a/grafana/grafana-postgres/Chart.yaml b/grafana/grafana-postgres/Chart.yaml
new file mode 100644
index 0000000..3b06308
--- /dev/null
+++ b/grafana/grafana-postgres/Chart.yaml
@@ -0,0 +1,9 @@
+apiVersion: v2
+name: grafana-database
+version: 0.6.0
+type: application
+dependencies:
+  - name: cluster
+    version: ~0.6.0
+    repository: "https://cloudnative-pg.github.io/charts"
+    alias: app
diff --git a/grafana/grafana-postgres/values.yaml b/grafana/grafana-postgres/values.yaml
new file mode 100644
index 0000000..03f9f47
--- /dev/null
+++ b/grafana/grafana-postgres/values.yaml
@@ -0,0 +1,20 @@
+app:
+  cluster:
+    instances: 1
+    storage:
+      size: 1Gi
+    resources:
+      limits:
+        memory: 512Mi
+      requests:
+        cpu: 100m
+        memory: 256Mi
+    postgresql:
+      parameters:
+        shared_buffers: "128MB"
+        max_connections: "100"
+        effective_cache_size: "256MB"
+    monitoring:
+      enabled: true
+      podMonitor:
+        enabled: true