diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 0000000..59f4f26
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,16 @@
+repos:
+  # update the chart README.md with the comments from values.yaml
+  - repo: https://github.com/norwoodj/helm-docs
+    rev: v1.2.0
+    hooks:
+      - id: helm-docs
+  # helm lint and markdown link verifier
+  - repo: https://github.com/gruntwork-io/pre-commit
+    rev: v0.1.22 # Get the latest from: https://github.com/gruntwork-io/pre-commit/releases
+    hooks:
+      - id: helmlint
+  # detect any secrets that may be committed before they're committed
+  - repo: https://github.com/gitleaks/gitleaks
+    rev: v8.17.0
+    hooks:
+      - id: gitleaks
diff --git a/README.md b/README.md
index 4ee87c8..4a28420 100644
--- a/README.md
+++ b/README.md
@@ -1,37 +1 @@
-# cnpg-tenant
-
-![Version: 0.0.1](https://img.shields.io/badge/Version-0.0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
-
-Create postgres tenant clusters managed by the CNPG Operator
-
-https://cloudymax.github.io/cloudnative-pg-tenant-chart/
-
-## Maintainers
-
-| Name | Email | Url |
-| ---- | ------ | --- |
-| cloudymax |  | <https://github.com/cloudymax/> |
-
-## Values
-
-| Key | Type | Default | Description |
-|-----|------|---------|-------------|
-| backup.destinationPath | string | `"backups"` |  |
-| backup.retentionPolicy | string | `"30d"` |  |
-| backup.s3Credentials.accessKeyId.key | string | `"ACCESS_KEY_ID"` |  |
-| backup.s3Credentials.accessKeyId.name | string | `"aws-creds"` |  |
-| backup.s3Credentials.secretAccessKey.key | string | `"ACCESS_SECRET_KEY"` |  |
-| backup.s3Credentials.secretAccessKey.name | string | `"aws-creds"` |  |
-| instances | int | `3` |  |
-| monitoring.enablePodMonitor | bool | `true` |  |
-| name | string | `"example"` |  |
-| postgresql.pg_hba[0] | string | `"hostnossl all all 0.0.0.0/0 reject"` |  |
-| postgresql.pg_hba[1] | string | `"hostssl all all 0.0.0.0/0 cert clientcert=verify-full"` |  |
-| scheduledBackup.name | string | `"example-backup"` |  |
-| scheduledBackup.spec.backupOwnerReference | string | `"self"` |  |
-| scheduledBackup.spec.cluster.name | string | `"pg-backup"` |  |
-| scheduledBackup.spec.schedule | string | `"0 0 0 * * *"` |  |
-| storage.size | string | `"1Gi"` |  |
-
-----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.11.3](https://github.com/norwoodj/helm-docs/releases/v1.11.3)
+# CloudNativePG Tenant Chart
diff --git a/Chart.yaml b/charts/cloudnative-pg-tenant/Chart.yaml
similarity index 100%
rename from Chart.yaml
rename to charts/cloudnative-pg-tenant/Chart.yaml
diff --git a/charts/cloudnative-pg-tenant/README.md b/charts/cloudnative-pg-tenant/README.md
new file mode 100644
index 0000000..9aa7968
--- /dev/null
+++ b/charts/cloudnative-pg-tenant/README.md
@@ -0,0 +1,35 @@
+# cnpg-tenant
+
+![Version: 0.0.1](https://img.shields.io/badge/Version-0.0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+
+Create postgres tenant clusters managed by the CNPG Operator
+
+## Maintainers
+
+| Name | Email | Url |
+| ---- | ------ | --- |
+| cloudymax |  | <https://github.com/cloudymax/> |
+
+## Values
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| backup.destinationPath | string | `"backups"` |  |
+| backup.retentionPolicy | string | `"30d"` |  |
+| backup.s3Credentials.accessKeyId.key | string | `"ACCESS_KEY_ID"` |  |
+| backup.s3Credentials.accessKeyId.name | string | `"aws-creds"` |  |
+| backup.s3Credentials.secretAccessKey.key | string | `"ACCESS_SECRET_KEY"` |  |
+| backup.s3Credentials.secretAccessKey.name | string | `"aws-creds"` |  |
+| instances | int | `3` |  |
+| monitoring.enablePodMonitor | bool | `true` |  |
+| name | string | `"example"` |  |
+| postgresql.pg_hba[0] | string | `"hostnossl all all 0.0.0.0/0 reject"` |  |
+| postgresql.pg_hba[1] | string | `"hostssl all all 0.0.0.0/0 cert clientcert=verify-full"` |  |
+| scheduledBackup.name | string | `"example-backup"` |  |
+| scheduledBackup.spec.backupOwnerReference | string | `"self"` |  |
+| scheduledBackup.spec.cluster.name | string | `"pg-backup"` |  |
+| scheduledBackup.spec.schedule | string | `"0 0 0 * * *"` |  |
+| storage.size | string | `"1Gi"` |  |
+
+----------------------------------------------
+Autogenerated from chart metadata using [helm-docs v1.11.3](https://github.com/norwoodj/helm-docs/releases/v1.11.3)
diff --git a/templates/_helpers.tpl b/charts/cloudnative-pg-tenant/templates/_helpers.tpl
similarity index 100%
rename from templates/_helpers.tpl
rename to charts/cloudnative-pg-tenant/templates/_helpers.tpl
diff --git a/templates/tenant.yaml b/charts/cloudnative-pg-tenant/templates/tenant.yaml
similarity index 100%
rename from templates/tenant.yaml
rename to charts/cloudnative-pg-tenant/templates/tenant.yaml
diff --git a/values.yaml b/charts/cloudnative-pg-tenant/values.yaml
similarity index 100%
rename from values.yaml
rename to charts/cloudnative-pg-tenant/values.yaml
diff --git a/robots.txt b/robots.txt
new file mode 100644
index 0000000..c6742d8
--- /dev/null
+++ b/robots.txt
@@ -0,0 +1,2 @@
+User-Agent: *
+Disallow: /