diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 0000000..f23740d
--- /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@v4
+        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.7.0
+        env:
+          CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/README.md b/README.md
index 8e46ebf..2081e81 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,12 @@
 # Etherpad  Helm Chart
 
 A [Helm](https://helm.sh) chart to install [Etherpad ](https://etherpad.org/) on [Kubernetes](https://kubernetes.io)
+
+## Installing the Chart
+
+To install the chart use the following:
+
+```
+helm repo add etherpad https://ether.github.io/ether-charts
+helm upgrade --install etherpad etherpad/etherpad
+```
diff --git a/Chart.yaml b/charts/etherpad/Chart.yaml
similarity index 98%
rename from Chart.yaml
rename to charts/etherpad/Chart.yaml
index 7246316..bec799e 100644
--- a/Chart.yaml
+++ b/charts/etherpad/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.0
+version: 0.1.2
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/argocd.yaml b/charts/etherpad/argocd.yaml
similarity index 100%
rename from argocd.yaml
rename to charts/etherpad/argocd.yaml
diff --git a/templates/NOTES.txt b/charts/etherpad/templates/NOTES.txt
similarity index 100%
rename from templates/NOTES.txt
rename to charts/etherpad/templates/NOTES.txt
diff --git a/templates/_helpers.tpl b/charts/etherpad/templates/_helpers.tpl
similarity index 100%
rename from templates/_helpers.tpl
rename to charts/etherpad/templates/_helpers.tpl
diff --git a/templates/deployment.yaml b/charts/etherpad/templates/deployment.yaml
similarity index 100%
rename from templates/deployment.yaml
rename to charts/etherpad/templates/deployment.yaml
diff --git a/templates/hpa.yaml b/charts/etherpad/templates/hpa.yaml
similarity index 100%
rename from templates/hpa.yaml
rename to charts/etherpad/templates/hpa.yaml
diff --git a/templates/ingress.yaml b/charts/etherpad/templates/ingress.yaml
similarity index 92%
rename from templates/ingress.yaml
rename to charts/etherpad/templates/ingress.yaml
index 2dac1e6..178afd2 100644
--- a/templates/ingress.yaml
+++ b/charts/etherpad/templates/ingress.yaml
@@ -5,6 +5,9 @@ metadata:
   name: {{ include "etherpad.fullname" . }}
   labels:
     {{- include "etherpad.labels" . | nindent 4 }}
+    {{- with .Values.ingress.labels }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
   {{- with .Values.ingress.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
diff --git a/templates/service.yaml b/charts/etherpad/templates/service.yaml
similarity index 100%
rename from templates/service.yaml
rename to charts/etherpad/templates/service.yaml
diff --git a/templates/serviceaccount.yaml b/charts/etherpad/templates/serviceaccount.yaml
similarity index 100%
rename from templates/serviceaccount.yaml
rename to charts/etherpad/templates/serviceaccount.yaml
diff --git a/templates/tests/test-connection.yaml b/charts/etherpad/templates/tests/test-connection.yaml
similarity index 100%
rename from templates/tests/test-connection.yaml
rename to charts/etherpad/templates/tests/test-connection.yaml
diff --git a/values-dev.yaml b/charts/etherpad/values-dev.yaml
similarity index 100%
rename from values-dev.yaml
rename to charts/etherpad/values-dev.yaml
diff --git a/values-go-dev.yaml b/charts/etherpad/values-go-dev.yaml
similarity index 100%
rename from values-go-dev.yaml
rename to charts/etherpad/values-go-dev.yaml
diff --git a/values-go-prod.yaml b/charts/etherpad/values-go-prod.yaml
similarity index 100%
rename from values-go-prod.yaml
rename to charts/etherpad/values-go-prod.yaml
diff --git a/values.yaml b/charts/etherpad/values.yaml
similarity index 99%
rename from values.yaml
rename to charts/etherpad/values.yaml
index 020683d..831c25a 100644
--- a/values.yaml
+++ b/charts/etherpad/values.yaml
@@ -91,6 +91,7 @@ ingress:
     nginx.ingress.kubernetes.io/proxy-read-timeout: "3600"
     nginx.ingress.kubernetes.io/proxy-send-timeout: "3600"
     nginx.org/websocket-services: "etherpad"
+  labels: {}
   hosts:
     - host: chart-example.local
       paths: