diff --git a/.github/workflows/helm-release.yml b/.github/workflows/helm-release.yml
index 3d100183..ff028c12 100644
--- a/.github/workflows/helm-release.yml
+++ b/.github/workflows/helm-release.yml
@@ -6,7 +6,7 @@ on:
     branches:
       - main
     paths:
-      - 'helm-chart/**'
+      - 'nextcloud-aio-helm-chart/**'
 
 jobs:
   release:
@@ -40,7 +40,7 @@ jobs:
         # TODO: switch back @main to a specific version like @v1.5.1 or higher
         uses: helm/chart-releaser-action@main
         with:
-          charts_dir: helm-chart
+          charts_dir: '.'
           mark_as_latest: false
         env:
           CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/helm-chart/Chart.yaml b/nextcloud-aio-helm-chart/Chart.yaml
similarity index 90%
rename from helm-chart/Chart.yaml
rename to nextcloud-aio-helm-chart/Chart.yaml
index 43cfa80d..3367a813 100755
--- a/helm-chart/Chart.yaml
+++ b/nextcloud-aio-helm-chart/Chart.yaml
@@ -1,4 +1,4 @@
-name: Nextcloud AIO Helm Chart
+name: nextcloud-aio-helm-chart
 description: A generated Helm Chart for Nextcloud AIO from Skippbox Kompose
 version: 4.7.0
 apiVersion: v2
diff --git a/helm-chart/readme.md b/nextcloud-aio-helm-chart/readme.md
similarity index 100%
rename from helm-chart/readme.md
rename to nextcloud-aio-helm-chart/readme.md
diff --git a/helm-chart/templates/nextcloud-aio-apache-deployment.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-apache-deployment.yaml
similarity index 100%
rename from helm-chart/templates/nextcloud-aio-apache-deployment.yaml
rename to nextcloud-aio-helm-chart/templates/nextcloud-aio-apache-deployment.yaml
diff --git a/helm-chart/templates/nextcloud-aio-apache-persistentvolumeclaim.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-apache-persistentvolumeclaim.yaml
similarity index 100%
rename from helm-chart/templates/nextcloud-aio-apache-persistentvolumeclaim.yaml
rename to nextcloud-aio-helm-chart/templates/nextcloud-aio-apache-persistentvolumeclaim.yaml
diff --git a/helm-chart/templates/nextcloud-aio-apache-service.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-apache-service.yaml
similarity index 100%
rename from helm-chart/templates/nextcloud-aio-apache-service.yaml
rename to nextcloud-aio-helm-chart/templates/nextcloud-aio-apache-service.yaml
diff --git a/helm-chart/templates/nextcloud-aio-clamav-deployment.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-clamav-deployment.yaml
similarity index 100%
rename from helm-chart/templates/nextcloud-aio-clamav-deployment.yaml
rename to nextcloud-aio-helm-chart/templates/nextcloud-aio-clamav-deployment.yaml
diff --git a/helm-chart/templates/nextcloud-aio-clamav-persistentvolumeclaim.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-clamav-persistentvolumeclaim.yaml
similarity index 100%
rename from helm-chart/templates/nextcloud-aio-clamav-persistentvolumeclaim.yaml
rename to nextcloud-aio-helm-chart/templates/nextcloud-aio-clamav-persistentvolumeclaim.yaml
diff --git a/helm-chart/templates/nextcloud-aio-clamav-service.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-clamav-service.yaml
similarity index 100%
rename from helm-chart/templates/nextcloud-aio-clamav-service.yaml
rename to nextcloud-aio-helm-chart/templates/nextcloud-aio-clamav-service.yaml
diff --git a/helm-chart/templates/nextcloud-aio-collabora-deployment.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-collabora-deployment.yaml
similarity index 100%
rename from helm-chart/templates/nextcloud-aio-collabora-deployment.yaml
rename to nextcloud-aio-helm-chart/templates/nextcloud-aio-collabora-deployment.yaml
diff --git a/helm-chart/templates/nextcloud-aio-collabora-fonts-persistentvolumeclaim.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-collabora-fonts-persistentvolumeclaim.yaml
similarity index 100%
rename from helm-chart/templates/nextcloud-aio-collabora-fonts-persistentvolumeclaim.yaml
rename to nextcloud-aio-helm-chart/templates/nextcloud-aio-collabora-fonts-persistentvolumeclaim.yaml
diff --git a/helm-chart/templates/nextcloud-aio-collabora-service.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-collabora-service.yaml
similarity index 100%
rename from helm-chart/templates/nextcloud-aio-collabora-service.yaml
rename to nextcloud-aio-helm-chart/templates/nextcloud-aio-collabora-service.yaml
diff --git a/helm-chart/templates/nextcloud-aio-database-deployment.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-database-deployment.yaml
similarity index 100%
rename from helm-chart/templates/nextcloud-aio-database-deployment.yaml
rename to nextcloud-aio-helm-chart/templates/nextcloud-aio-database-deployment.yaml
diff --git a/helm-chart/templates/nextcloud-aio-database-dump-persistentvolumeclaim.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-database-dump-persistentvolumeclaim.yaml
similarity index 100%
rename from helm-chart/templates/nextcloud-aio-database-dump-persistentvolumeclaim.yaml
rename to nextcloud-aio-helm-chart/templates/nextcloud-aio-database-dump-persistentvolumeclaim.yaml
diff --git a/helm-chart/templates/nextcloud-aio-database-persistentvolumeclaim.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-database-persistentvolumeclaim.yaml
similarity index 100%
rename from helm-chart/templates/nextcloud-aio-database-persistentvolumeclaim.yaml
rename to nextcloud-aio-helm-chart/templates/nextcloud-aio-database-persistentvolumeclaim.yaml
diff --git a/helm-chart/templates/nextcloud-aio-database-service.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-database-service.yaml
similarity index 100%
rename from helm-chart/templates/nextcloud-aio-database-service.yaml
rename to nextcloud-aio-helm-chart/templates/nextcloud-aio-database-service.yaml
diff --git a/helm-chart/templates/nextcloud-aio-elasticsearch-persistentvolumeclaim.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-elasticsearch-persistentvolumeclaim.yaml
similarity index 100%
rename from helm-chart/templates/nextcloud-aio-elasticsearch-persistentvolumeclaim.yaml
rename to nextcloud-aio-helm-chart/templates/nextcloud-aio-elasticsearch-persistentvolumeclaim.yaml
diff --git a/helm-chart/templates/nextcloud-aio-fulltextsearch-deployment.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-fulltextsearch-deployment.yaml
similarity index 100%
rename from helm-chart/templates/nextcloud-aio-fulltextsearch-deployment.yaml
rename to nextcloud-aio-helm-chart/templates/nextcloud-aio-fulltextsearch-deployment.yaml
diff --git a/helm-chart/templates/nextcloud-aio-fulltextsearch-service.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-fulltextsearch-service.yaml
similarity index 100%
rename from helm-chart/templates/nextcloud-aio-fulltextsearch-service.yaml
rename to nextcloud-aio-helm-chart/templates/nextcloud-aio-fulltextsearch-service.yaml
diff --git a/helm-chart/templates/nextcloud-aio-imaginary-deployment.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-imaginary-deployment.yaml
similarity index 100%
rename from helm-chart/templates/nextcloud-aio-imaginary-deployment.yaml
rename to nextcloud-aio-helm-chart/templates/nextcloud-aio-imaginary-deployment.yaml
diff --git a/helm-chart/templates/nextcloud-aio-imaginary-service.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-imaginary-service.yaml
similarity index 100%
rename from helm-chart/templates/nextcloud-aio-imaginary-service.yaml
rename to nextcloud-aio-helm-chart/templates/nextcloud-aio-imaginary-service.yaml
diff --git a/helm-chart/templates/nextcloud-aio-networkpolicy.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-networkpolicy.yaml
similarity index 100%
rename from helm-chart/templates/nextcloud-aio-networkpolicy.yaml
rename to nextcloud-aio-helm-chart/templates/nextcloud-aio-networkpolicy.yaml
diff --git a/helm-chart/templates/nextcloud-aio-nextcloud-data-persistentvolumeclaim.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-data-persistentvolumeclaim.yaml
similarity index 100%
rename from helm-chart/templates/nextcloud-aio-nextcloud-data-persistentvolumeclaim.yaml
rename to nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-data-persistentvolumeclaim.yaml
diff --git a/helm-chart/templates/nextcloud-aio-nextcloud-deployment.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-deployment.yaml
similarity index 100%
rename from helm-chart/templates/nextcloud-aio-nextcloud-deployment.yaml
rename to nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-deployment.yaml
diff --git a/helm-chart/templates/nextcloud-aio-nextcloud-persistentvolumeclaim.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-persistentvolumeclaim.yaml
similarity index 100%
rename from helm-chart/templates/nextcloud-aio-nextcloud-persistentvolumeclaim.yaml
rename to nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-persistentvolumeclaim.yaml
diff --git a/helm-chart/templates/nextcloud-aio-nextcloud-service.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-service.yaml
similarity index 100%
rename from helm-chart/templates/nextcloud-aio-nextcloud-service.yaml
rename to nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-service.yaml
diff --git a/helm-chart/templates/nextcloud-aio-nextcloud-trusted-cacerts-persistentvolumeclaim.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-trusted-cacerts-persistentvolumeclaim.yaml
similarity index 100%
rename from helm-chart/templates/nextcloud-aio-nextcloud-trusted-cacerts-persistentvolumeclaim.yaml
rename to nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-trusted-cacerts-persistentvolumeclaim.yaml
diff --git a/helm-chart/templates/nextcloud-aio-onlyoffice-deployment.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-onlyoffice-deployment.yaml
similarity index 100%
rename from helm-chart/templates/nextcloud-aio-onlyoffice-deployment.yaml
rename to nextcloud-aio-helm-chart/templates/nextcloud-aio-onlyoffice-deployment.yaml
diff --git a/helm-chart/templates/nextcloud-aio-onlyoffice-persistentvolumeclaim.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-onlyoffice-persistentvolumeclaim.yaml
similarity index 100%
rename from helm-chart/templates/nextcloud-aio-onlyoffice-persistentvolumeclaim.yaml
rename to nextcloud-aio-helm-chart/templates/nextcloud-aio-onlyoffice-persistentvolumeclaim.yaml
diff --git a/helm-chart/templates/nextcloud-aio-onlyoffice-service.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-onlyoffice-service.yaml
similarity index 100%
rename from helm-chart/templates/nextcloud-aio-onlyoffice-service.yaml
rename to nextcloud-aio-helm-chart/templates/nextcloud-aio-onlyoffice-service.yaml
diff --git a/helm-chart/templates/nextcloud-aio-redis-deployment.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-redis-deployment.yaml
similarity index 100%
rename from helm-chart/templates/nextcloud-aio-redis-deployment.yaml
rename to nextcloud-aio-helm-chart/templates/nextcloud-aio-redis-deployment.yaml
diff --git a/helm-chart/templates/nextcloud-aio-redis-persistentvolumeclaim.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-redis-persistentvolumeclaim.yaml
similarity index 100%
rename from helm-chart/templates/nextcloud-aio-redis-persistentvolumeclaim.yaml
rename to nextcloud-aio-helm-chart/templates/nextcloud-aio-redis-persistentvolumeclaim.yaml
diff --git a/helm-chart/templates/nextcloud-aio-redis-service.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-redis-service.yaml
similarity index 100%
rename from helm-chart/templates/nextcloud-aio-redis-service.yaml
rename to nextcloud-aio-helm-chart/templates/nextcloud-aio-redis-service.yaml
diff --git a/helm-chart/templates/nextcloud-aio-talk-deployment.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-deployment.yaml
similarity index 100%
rename from helm-chart/templates/nextcloud-aio-talk-deployment.yaml
rename to nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-deployment.yaml
diff --git a/helm-chart/templates/nextcloud-aio-talk-service.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-service.yaml
similarity index 100%
rename from helm-chart/templates/nextcloud-aio-talk-service.yaml
rename to nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-service.yaml
diff --git a/helm-chart/update-helm.sh b/nextcloud-aio-helm-chart/update-helm.sh
similarity index 97%
rename from helm-chart/update-helm.sh
rename to nextcloud-aio-helm-chart/update-helm.sh
index 393188c2..275dd2ed 100755
--- a/helm-chart/update-helm.sh
+++ b/nextcloud-aio-helm-chart/update-helm.sh
@@ -2,6 +2,9 @@
 
 DOCKER_TAG="$1"
 
+# The logic needs the files in ./helm-chart
+mv ./nextcloud-aio-helm-chart ./helm-chart
+
 # Clean
 rm -f ./helm-chart/values.yaml
 rm -rf ./helm-chart/templates
@@ -199,4 +202,9 @@ done
 
 chmod 777 -R ./
 
+# Seems like the dir needs to match the name of the chart
+cd ../
+rm -rf ./nextcloud-aio-helm-chart
+mv ./helm-chart ./nextcloud-aio-helm-chart
+
 set +ex
diff --git a/helm-chart/values.yaml b/nextcloud-aio-helm-chart/values.yaml
similarity index 100%
rename from helm-chart/values.yaml
rename to nextcloud-aio-helm-chart/values.yaml