diff --git a/.github/workflows/helm-chart.yml b/.github/workflows/helm-chart.yml
index c9de0ed7..b97b24ea 100644
--- a/.github/workflows/helm-chart.yml
+++ b/.github/workflows/helm-chart.yml
@@ -40,7 +40,5 @@ jobs:
 
       - name: Run chart-releaser
         uses: helm/chart-releaser-action@v1.4.0
-        with:
-          charts_dir: .
         env:
           CR_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 1ded7183..f6175389 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -2,12 +2,12 @@
   "files.exclude": {
     "oada": true,
     "k8s": true,
-    "helm": true
+    "charts": true
   },
   "search.exclude": {
     "oada": true,
     "k8s": true,
-    "helm": true
+    "charts": true
   },
   "prettier.prettierPath": "oada/.yarn/sdks/prettier/index.js",
   "typescript.tsdk": "oada/.yarn/sdks/typescript/lib",
diff --git a/helm/.helmignore b/charts/oada/.helmignore
similarity index 100%
rename from helm/.helmignore
rename to charts/oada/.helmignore
diff --git a/helm/Chart.yaml b/charts/oada/Chart.yaml
similarity index 100%
rename from helm/Chart.yaml
rename to charts/oada/Chart.yaml
diff --git a/helm/README.md b/charts/oada/README.md
similarity index 92%
rename from helm/README.md
rename to charts/oada/README.md
index eaeef8de..11151b8b 100644
--- a/helm/README.md
+++ b/charts/oada/README.md
@@ -27,9 +27,9 @@ Supports multiple release installs and non-default namespace.
 - At least one ingress controller
 
 Attempt to apply all prerequisites:
-`kubectl apply -k ../k8s/support`
+`kubectl apply -k ../../k8s/support`
 
-The above command might error on first run.
+The above command might error on the first run.
 After 2-3 times, it should run without error.
 
 ## Installation
diff --git a/helm/templates/NOTES.txt b/charts/oada/templates/NOTES.txt
similarity index 100%
rename from helm/templates/NOTES.txt
rename to charts/oada/templates/NOTES.txt
diff --git a/helm/templates/_helpers.tpl b/charts/oada/templates/_helpers.tpl
similarity index 100%
rename from helm/templates/_helpers.tpl
rename to charts/oada/templates/_helpers.tpl
diff --git a/helm/templates/arangodb.yaml b/charts/oada/templates/arangodb.yaml
similarity index 100%
rename from helm/templates/arangodb.yaml
rename to charts/oada/templates/arangodb.yaml
diff --git a/helm/templates/auth.yaml b/charts/oada/templates/auth.yaml
similarity index 100%
rename from helm/templates/auth.yaml
rename to charts/oada/templates/auth.yaml
diff --git a/helm/templates/binary-data.yaml b/charts/oada/templates/binary-data.yaml
similarity index 100%
rename from helm/templates/binary-data.yaml
rename to charts/oada/templates/binary-data.yaml
diff --git a/helm/templates/configmap.yaml b/charts/oada/templates/configmap.yaml
similarity index 100%
rename from helm/templates/configmap.yaml
rename to charts/oada/templates/configmap.yaml
diff --git a/helm/templates/deployment.yaml b/charts/oada/templates/deployment.yaml
similarity index 100%
rename from helm/templates/deployment.yaml
rename to charts/oada/templates/deployment.yaml
diff --git a/helm/templates/http.yaml b/charts/oada/templates/http.yaml
similarity index 100%
rename from helm/templates/http.yaml
rename to charts/oada/templates/http.yaml
diff --git a/helm/templates/init.yaml b/charts/oada/templates/init.yaml
similarity index 100%
rename from helm/templates/init.yaml
rename to charts/oada/templates/init.yaml
diff --git a/helm/templates/letsencrypt.yaml b/charts/oada/templates/letsencrypt.yaml
similarity index 100%
rename from helm/templates/letsencrypt.yaml
rename to charts/oada/templates/letsencrypt.yaml
diff --git a/helm/templates/redpanda.yaml b/charts/oada/templates/redpanda.yaml
similarity index 100%
rename from helm/templates/redpanda.yaml
rename to charts/oada/templates/redpanda.yaml
diff --git a/helm/templates/service-account.yaml b/charts/oada/templates/service-account.yaml
similarity index 100%
rename from helm/templates/service-account.yaml
rename to charts/oada/templates/service-account.yaml
diff --git a/helm/templates/tests/bookmarks.yaml b/charts/oada/templates/tests/bookmarks.yaml
similarity index 100%
rename from helm/templates/tests/bookmarks.yaml
rename to charts/oada/templates/tests/bookmarks.yaml
diff --git a/helm/templates/tests/well-known.yaml b/charts/oada/templates/tests/well-known.yaml
similarity index 100%
rename from helm/templates/tests/well-known.yaml
rename to charts/oada/templates/tests/well-known.yaml
diff --git a/helm/templates/users.yaml b/charts/oada/templates/users.yaml
similarity index 100%
rename from helm/templates/users.yaml
rename to charts/oada/templates/users.yaml
diff --git a/helm/templates/well-known.yaml b/charts/oada/templates/well-known.yaml
similarity index 100%
rename from helm/templates/well-known.yaml
rename to charts/oada/templates/well-known.yaml
diff --git a/helm/values.yaml b/charts/oada/values.yaml
similarity index 99%
rename from helm/values.yaml
rename to charts/oada/values.yaml
index 11e3ba0d..f5d7db87 100644
--- a/helm/values.yaml
+++ b/charts/oada/values.yaml
@@ -46,7 +46,7 @@ arangodb:
   # arangodb.image is the Docker image to use for arangodb
   image: arangodb/arangodb
   # arangodb.tag is the Docker tag for the ArangoDB images
-  tag: 3.7.12
+  tag: 3.9.1
 
 kafka:
   # kafka.brokers is an array of an external Kafka brokers.
diff --git a/oada-server.code-workspace b/oada-server.code-workspace
index c568b41d..830822e3 100644
--- a/oada-server.code-workspace
+++ b/oada-server.code-workspace
@@ -15,7 +15,7 @@
     },
     {
       "name": "⎈ Helm chart",
-      "path": "helm"
+      "path": "charts/oada"
     },
     {
       "name": "📦 @oada/lib-arangodb",