diff --git a/.github/workflows/helm-release.yml b/.github/workflows/helm-release.yml
index eae9e35..c0471c4 100644
--- a/.github/workflows/helm-release.yml
+++ b/.github/workflows/helm-release.yml
@@ -5,8 +5,7 @@ on:
     branches:
       - "main"
     paths:
-      - "broker-2-http/chart/**"
-      - "http-2-broker/chart/**"
+      - "charts/**"
   workflow_dispatch:
 
 jobs:
@@ -14,13 +13,6 @@ jobs:
     runs-on: ubuntu-latest
     permissions:
       contents: write
-    strategy:
-      matrix:
-        include:
-          - chart_dir: broker-2-http/chart/
-            app_name: broker-2-http
-          - chart_dir: http-2-broker/chart/
-            app_name: http-2-broker
 
     steps:
       - uses: actions/checkout@v4
@@ -41,9 +33,9 @@ jobs:
         run: |
           helm repo add bitnami https://charts.bitnami.com/bitnami
 
-      - name: Run chart-releaser for ${{ matrix.app_name }}
+      - name: Run chart-releaser for all applications
         uses: helm/chart-releaser-action@v1.6.0
         env:
           CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         with:
-          charts_dir: ${{ matrix.chart_dir }}
+          charts_dir: charts
diff --git a/broker-2-http/chart/.gitignore b/charts/.gitignore
similarity index 100%
rename from broker-2-http/chart/.gitignore
rename to charts/.gitignore
diff --git a/broker-2-http/chart/broker-2-http/.gitignore b/charts/broker-2-http/.gitignore
similarity index 100%
rename from broker-2-http/chart/broker-2-http/.gitignore
rename to charts/broker-2-http/.gitignore
diff --git a/broker-2-http/chart/broker-2-http/.helmignore b/charts/broker-2-http/.helmignore
similarity index 100%
rename from broker-2-http/chart/broker-2-http/.helmignore
rename to charts/broker-2-http/.helmignore
diff --git a/broker-2-http/chart/broker-2-http/Chart.yaml b/charts/broker-2-http/Chart.yaml
similarity index 100%
rename from broker-2-http/chart/broker-2-http/Chart.yaml
rename to charts/broker-2-http/Chart.yaml
diff --git a/broker-2-http/chart/broker-2-http/README.md b/charts/broker-2-http/README.md
similarity index 100%
rename from broker-2-http/chart/broker-2-http/README.md
rename to charts/broker-2-http/README.md
diff --git a/broker-2-http/chart/broker-2-http/templates/NOTES.txt b/charts/broker-2-http/templates/NOTES.txt
similarity index 100%
rename from broker-2-http/chart/broker-2-http/templates/NOTES.txt
rename to charts/broker-2-http/templates/NOTES.txt
diff --git a/broker-2-http/chart/broker-2-http/templates/_helpers.tpl b/charts/broker-2-http/templates/_helpers.tpl
similarity index 100%
rename from broker-2-http/chart/broker-2-http/templates/_helpers.tpl
rename to charts/broker-2-http/templates/_helpers.tpl
diff --git a/broker-2-http/chart/broker-2-http/templates/deployment.yaml b/charts/broker-2-http/templates/deployment.yaml
similarity index 100%
rename from broker-2-http/chart/broker-2-http/templates/deployment.yaml
rename to charts/broker-2-http/templates/deployment.yaml
diff --git a/broker-2-http/chart/broker-2-http/templates/extra-list.yaml b/charts/broker-2-http/templates/extra-list.yaml
similarity index 100%
rename from broker-2-http/chart/broker-2-http/templates/extra-list.yaml
rename to charts/broker-2-http/templates/extra-list.yaml
diff --git a/broker-2-http/chart/broker-2-http/templates/hpa.yaml b/charts/broker-2-http/templates/hpa.yaml
similarity index 100%
rename from broker-2-http/chart/broker-2-http/templates/hpa.yaml
rename to charts/broker-2-http/templates/hpa.yaml
diff --git a/broker-2-http/chart/broker-2-http/templates/ingress.yaml b/charts/broker-2-http/templates/ingress.yaml
similarity index 100%
rename from broker-2-http/chart/broker-2-http/templates/ingress.yaml
rename to charts/broker-2-http/templates/ingress.yaml
diff --git a/broker-2-http/chart/broker-2-http/templates/pdb.yaml b/charts/broker-2-http/templates/pdb.yaml
similarity index 100%
rename from broker-2-http/chart/broker-2-http/templates/pdb.yaml
rename to charts/broker-2-http/templates/pdb.yaml
diff --git a/broker-2-http/chart/broker-2-http/templates/service-account.yaml b/charts/broker-2-http/templates/service-account.yaml
similarity index 100%
rename from broker-2-http/chart/broker-2-http/templates/service-account.yaml
rename to charts/broker-2-http/templates/service-account.yaml
diff --git a/broker-2-http/chart/broker-2-http/templates/service.yaml b/charts/broker-2-http/templates/service.yaml
similarity index 100%
rename from broker-2-http/chart/broker-2-http/templates/service.yaml
rename to charts/broker-2-http/templates/service.yaml
diff --git a/broker-2-http/chart/broker-2-http/templates/tls-secrets.yaml b/charts/broker-2-http/templates/tls-secrets.yaml
similarity index 100%
rename from broker-2-http/chart/broker-2-http/templates/tls-secrets.yaml
rename to charts/broker-2-http/templates/tls-secrets.yaml
diff --git a/broker-2-http/chart/broker-2-http/values.yaml b/charts/broker-2-http/values.yaml
similarity index 100%
rename from broker-2-http/chart/broker-2-http/values.yaml
rename to charts/broker-2-http/values.yaml
diff --git a/http-2-broker/chart/http-2-broker/.gitignore b/charts/http-2-broker/.gitignore
similarity index 100%
rename from http-2-broker/chart/http-2-broker/.gitignore
rename to charts/http-2-broker/.gitignore
diff --git a/http-2-broker/chart/http-2-broker/.helmignore b/charts/http-2-broker/.helmignore
similarity index 100%
rename from http-2-broker/chart/http-2-broker/.helmignore
rename to charts/http-2-broker/.helmignore
diff --git a/http-2-broker/chart/http-2-broker/Chart.yaml b/charts/http-2-broker/Chart.yaml
similarity index 100%
rename from http-2-broker/chart/http-2-broker/Chart.yaml
rename to charts/http-2-broker/Chart.yaml
diff --git a/http-2-broker/chart/http-2-broker/README.md b/charts/http-2-broker/README.md
similarity index 100%
rename from http-2-broker/chart/http-2-broker/README.md
rename to charts/http-2-broker/README.md
diff --git a/http-2-broker/chart/http-2-broker/templates/NOTES.txt b/charts/http-2-broker/templates/NOTES.txt
similarity index 100%
rename from http-2-broker/chart/http-2-broker/templates/NOTES.txt
rename to charts/http-2-broker/templates/NOTES.txt
diff --git a/http-2-broker/chart/http-2-broker/templates/_helpers.tpl b/charts/http-2-broker/templates/_helpers.tpl
similarity index 100%
rename from http-2-broker/chart/http-2-broker/templates/_helpers.tpl
rename to charts/http-2-broker/templates/_helpers.tpl
diff --git a/http-2-broker/chart/http-2-broker/templates/deployment.yaml b/charts/http-2-broker/templates/deployment.yaml
similarity index 100%
rename from http-2-broker/chart/http-2-broker/templates/deployment.yaml
rename to charts/http-2-broker/templates/deployment.yaml
diff --git a/http-2-broker/chart/http-2-broker/templates/extra-list.yaml b/charts/http-2-broker/templates/extra-list.yaml
similarity index 100%
rename from http-2-broker/chart/http-2-broker/templates/extra-list.yaml
rename to charts/http-2-broker/templates/extra-list.yaml
diff --git a/http-2-broker/chart/http-2-broker/templates/hpa.yaml b/charts/http-2-broker/templates/hpa.yaml
similarity index 100%
rename from http-2-broker/chart/http-2-broker/templates/hpa.yaml
rename to charts/http-2-broker/templates/hpa.yaml
diff --git a/http-2-broker/chart/http-2-broker/templates/pdb.yaml b/charts/http-2-broker/templates/pdb.yaml
similarity index 100%
rename from http-2-broker/chart/http-2-broker/templates/pdb.yaml
rename to charts/http-2-broker/templates/pdb.yaml
diff --git a/http-2-broker/chart/http-2-broker/templates/service-account.yaml b/charts/http-2-broker/templates/service-account.yaml
similarity index 100%
rename from http-2-broker/chart/http-2-broker/templates/service-account.yaml
rename to charts/http-2-broker/templates/service-account.yaml
diff --git a/http-2-broker/chart/http-2-broker/values.yaml b/charts/http-2-broker/values.yaml
similarity index 100%
rename from http-2-broker/chart/http-2-broker/values.yaml
rename to charts/http-2-broker/values.yaml
diff --git a/http-2-broker/chart/.gitignore b/http-2-broker/chart/.gitignore
deleted file mode 100644
index ebf1d3d..0000000
--- a/http-2-broker/chart/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-charts