diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 0000000..05e84f9
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,27 @@
+name: Release Charts
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  release:
+    permissions:
+      contents: write
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Configure Git
+        run: |
+          git config user.name "$GITHUB_ACTOR"
+          git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
+
+      - name: Run chart-releaser
+        uses: helm/chart-releaser-action@v1.6.0
+        env:
+          CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
\ No newline at end of file
diff --git a/cf-helm-charts/cf-pg-pool-ii/.helmignore b/charts/cf-helm-charts/cf-pg-pool-ii/.helmignore
similarity index 100%
rename from cf-helm-charts/cf-pg-pool-ii/.helmignore
rename to charts/cf-helm-charts/cf-pg-pool-ii/.helmignore
diff --git a/cf-helm-charts/cf-pg-pool-ii/Chart.yaml b/charts/cf-helm-charts/cf-pg-pool-ii/Chart.yaml
similarity index 100%
rename from cf-helm-charts/cf-pg-pool-ii/Chart.yaml
rename to charts/cf-helm-charts/cf-pg-pool-ii/Chart.yaml
diff --git a/cf-helm-charts/cf-pg-pool-ii/templates/_helpers.tpl b/charts/cf-helm-charts/cf-pg-pool-ii/templates/_helpers.tpl
similarity index 100%
rename from cf-helm-charts/cf-pg-pool-ii/templates/_helpers.tpl
rename to charts/cf-helm-charts/cf-pg-pool-ii/templates/_helpers.tpl
diff --git a/cf-helm-charts/cf-pg-pool-ii/templates/configmap.yaml b/charts/cf-helm-charts/cf-pg-pool-ii/templates/configmap.yaml
similarity index 100%
rename from cf-helm-charts/cf-pg-pool-ii/templates/configmap.yaml
rename to charts/cf-helm-charts/cf-pg-pool-ii/templates/configmap.yaml
diff --git a/cf-helm-charts/cf-pg-pool-ii/templates/deployment.yaml b/charts/cf-helm-charts/cf-pg-pool-ii/templates/deployment.yaml
similarity index 100%
rename from cf-helm-charts/cf-pg-pool-ii/templates/deployment.yaml
rename to charts/cf-helm-charts/cf-pg-pool-ii/templates/deployment.yaml
diff --git a/cf-helm-charts/cf-pg-pool-ii/templates/service-monitor.yaml b/charts/cf-helm-charts/cf-pg-pool-ii/templates/service-monitor.yaml
similarity index 100%
rename from cf-helm-charts/cf-pg-pool-ii/templates/service-monitor.yaml
rename to charts/cf-helm-charts/cf-pg-pool-ii/templates/service-monitor.yaml
diff --git a/cf-helm-charts/cf-pg-pool-ii/templates/service.yaml b/charts/cf-helm-charts/cf-pg-pool-ii/templates/service.yaml
similarity index 100%
rename from cf-helm-charts/cf-pg-pool-ii/templates/service.yaml
rename to charts/cf-helm-charts/cf-pg-pool-ii/templates/service.yaml
diff --git a/cf-helm-charts/cf-pg-pool-ii/values.yaml b/charts/cf-helm-charts/cf-pg-pool-ii/values.yaml
similarity index 100%
rename from cf-helm-charts/cf-pg-pool-ii/values.yaml
rename to charts/cf-helm-charts/cf-pg-pool-ii/values.yaml
diff --git a/charts/cf-pg-pool-ii-0.0.1.tgz b/charts/cf-pg-pool-ii-0.0.1.tgz
deleted file mode 100644
index 794989f..0000000
Binary files a/charts/cf-pg-pool-ii-0.0.1.tgz and /dev/null differ
diff --git a/charts/index.yaml b/charts/index.yaml
deleted file mode 100644
index 4244d68..0000000
--- a/charts/index.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-apiVersion: v1
-entries:
-  cf-pg-pool-ii:
-  - apiVersion: v2
-    appVersion: 4.4.2
-    created: "2024-03-08T11:27:00.080512Z"
-    description: Pg Pool II Helm Chart
-    digest: 585403a7819c289eb3714c2a4fcb3ec44978cb3879d5335c0b498186f59a52c9
-    name: cf-pg-pool-ii
-    type: application
-    urls:
-    - https://cardano-foundation.github.io/cf-helm-charts/cf-pg-pool-ii-0.0.1.tgz
-    version: 0.0.1
-generated: "2024-03-08T11:27:00.080096Z"