diff --git a/.github/workflows/release-selfhost.yml b/.github/workflows/release-selfhost.yml
index ce2bb1c949..78009501f8 100644
--- a/.github/workflows/release-selfhost.yml
+++ b/.github/workflows/release-selfhost.yml
@@ -43,11 +43,6 @@ jobs:
           DOCKER_PASSWORD: ${{ secrets.DOCKER_API_KEY }}
           BUDIBASE_RELEASE_VERSION: ${{ steps.previoustag.outputs.tag }}
       
-      - name: Configure Git
-        run: |
-          git config user.name "Budibase Production Bot"
-          git config user.email "<>"
-      
       - uses: azure/setup-helm@v1
         id: install
 
@@ -55,10 +50,12 @@ jobs:
         env:
           BUDIBASE_RELEASE_VERSION: ${{ steps.previoustag.outputs.tag }}
 
+      - name: Configure Git
+        run: |
+          git config user.name "Budibase Helm Bot"
+          git config user.email "<>"
+      
       - name: Run chart-releaser
-        uses: helm/chart-releaser-action@v1.1.0
-        with:
-          charts_dir: docs
-          branch: helm-repo
+        uses: helm/chart-releaser-action@v1.2.0
         env:
-          CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
\ No newline at end of file
diff --git a/hosting/kubernetes/budibase/.helmignore b/charts/budibase/.helmignore
similarity index 100%
rename from hosting/kubernetes/budibase/.helmignore
rename to charts/budibase/.helmignore
diff --git a/hosting/kubernetes/budibase/Chart.yaml b/charts/budibase/Chart.yaml
similarity index 94%
rename from hosting/kubernetes/budibase/Chart.yaml
rename to charts/budibase/Chart.yaml
index 0528e56562..602ffbf420 100644
--- a/hosting/kubernetes/budibase/Chart.yaml
+++ b/charts/budibase/Chart.yaml
@@ -11,8 +11,8 @@ sources:
   - https://github.com/Budibase/budibase
   - https://budibase.com
 type: application
-version: 0.2.4
-appVersion: 1.0.6
+version: 0.2.6
+appVersion: 1.0.10
 dependencies:
   - name: couchdb
     version: 3.3.4
diff --git a/hosting/kubernetes/budibase/README.md b/charts/budibase/README.md
similarity index 100%
rename from hosting/kubernetes/budibase/README.md
rename to charts/budibase/README.md
diff --git a/hosting/kubernetes/budibase/charts/couchdb-3.3.4.tgz b/charts/budibase/charts/couchdb-3.3.4.tgz
similarity index 100%
rename from hosting/kubernetes/budibase/charts/couchdb-3.3.4.tgz
rename to charts/budibase/charts/couchdb-3.3.4.tgz
diff --git a/hosting/kubernetes/budibase/charts/ingress-nginx-3.35.0.tgz b/charts/budibase/charts/ingress-nginx-3.35.0.tgz
similarity index 100%
rename from hosting/kubernetes/budibase/charts/ingress-nginx-3.35.0.tgz
rename to charts/budibase/charts/ingress-nginx-3.35.0.tgz
diff --git a/hosting/kubernetes/budibase/templates/NOTES.txt b/charts/budibase/templates/NOTES.txt
similarity index 100%
rename from hosting/kubernetes/budibase/templates/NOTES.txt
rename to charts/budibase/templates/NOTES.txt
diff --git a/hosting/kubernetes/budibase/templates/_helpers.tpl b/charts/budibase/templates/_helpers.tpl
similarity index 100%
rename from hosting/kubernetes/budibase/templates/_helpers.tpl
rename to charts/budibase/templates/_helpers.tpl
diff --git a/hosting/kubernetes/budibase/templates/alb-ingress.yaml b/charts/budibase/templates/alb-ingress.yaml
similarity index 100%
rename from hosting/kubernetes/budibase/templates/alb-ingress.yaml
rename to charts/budibase/templates/alb-ingress.yaml
diff --git a/hosting/kubernetes/budibase/templates/app-service-deployment.yaml b/charts/budibase/templates/app-service-deployment.yaml
similarity index 98%
rename from hosting/kubernetes/budibase/templates/app-service-deployment.yaml
rename to charts/budibase/templates/app-service-deployment.yaml
index e75f84e779..8086c0ab20 100644
--- a/hosting/kubernetes/budibase/templates/app-service-deployment.yaml
+++ b/charts/budibase/templates/app-service-deployment.yaml
@@ -106,7 +106,7 @@ spec:
           value: {{ .Values.globals.accountPortalApiKey | quote }}
         - name: COOKIE_DOMAIN
           value: {{ .Values.globals.cookieDomain | quote }}
-        image: budibase/apps:{{ .Chart.appVersion }}
+        image: budibase/apps:{{ .Values.globals.appVersion }}
         imagePullPolicy: Always
         name: bbapps
         ports:
diff --git a/hosting/kubernetes/budibase/templates/app-service-service.yaml b/charts/budibase/templates/app-service-service.yaml
similarity index 100%
rename from hosting/kubernetes/budibase/templates/app-service-service.yaml
rename to charts/budibase/templates/app-service-service.yaml
diff --git a/hosting/kubernetes/budibase/templates/couchdb-backup.yaml b/charts/budibase/templates/couchdb-backup.yaml
similarity index 87%
rename from hosting/kubernetes/budibase/templates/couchdb-backup.yaml
rename to charts/budibase/templates/couchdb-backup.yaml
index 8d9c368864..1072046c8c 100644
--- a/hosting/kubernetes/budibase/templates/couchdb-backup.yaml
+++ b/charts/budibase/templates/couchdb-backup.yaml
@@ -30,9 +30,9 @@ spec:
         - name: SOURCE
           value: {{ .Values.services.couchdb.url }}
         - name: TARGET
-          value: {{ .Values.services.couchdb.backup.target }}
+          value: {{ .Values.services.couchdb.backup.target | quote }}
         - name: RUN_EVERY_SECS
-          value: {{ .Values.services.couchdb.backup.interval }}
+          value: {{ .Values.services.couchdb.backup.interval | quote }}
         - name: VERBOSE
           value: "true"
         image: redgeoff/replicate-couchdb-cluster
diff --git a/hosting/kubernetes/budibase/templates/hpa.yaml b/charts/budibase/templates/hpa.yaml
similarity index 100%
rename from hosting/kubernetes/budibase/templates/hpa.yaml
rename to charts/budibase/templates/hpa.yaml
diff --git a/hosting/kubernetes/budibase/templates/ingress.yaml b/charts/budibase/templates/ingress.yaml
similarity index 100%
rename from hosting/kubernetes/budibase/templates/ingress.yaml
rename to charts/budibase/templates/ingress.yaml
diff --git a/hosting/kubernetes/budibase/templates/minio-data-persistentvolumeclaim.yaml b/charts/budibase/templates/minio-data-persistentvolumeclaim.yaml
similarity index 100%
rename from hosting/kubernetes/budibase/templates/minio-data-persistentvolumeclaim.yaml
rename to charts/budibase/templates/minio-data-persistentvolumeclaim.yaml
diff --git a/hosting/kubernetes/budibase/templates/minio-service-deployment.yaml b/charts/budibase/templates/minio-service-deployment.yaml
similarity index 100%
rename from hosting/kubernetes/budibase/templates/minio-service-deployment.yaml
rename to charts/budibase/templates/minio-service-deployment.yaml
diff --git a/hosting/kubernetes/budibase/templates/minio-service-service.yaml b/charts/budibase/templates/minio-service-service.yaml
similarity index 100%
rename from hosting/kubernetes/budibase/templates/minio-service-service.yaml
rename to charts/budibase/templates/minio-service-service.yaml
diff --git a/hosting/kubernetes/budibase/templates/proxy-service-deployment.yaml b/charts/budibase/templates/proxy-service-deployment.yaml
similarity index 100%
rename from hosting/kubernetes/budibase/templates/proxy-service-deployment.yaml
rename to charts/budibase/templates/proxy-service-deployment.yaml
diff --git a/hosting/kubernetes/budibase/templates/proxy-service-service.yaml b/charts/budibase/templates/proxy-service-service.yaml
similarity index 100%
rename from hosting/kubernetes/budibase/templates/proxy-service-service.yaml
rename to charts/budibase/templates/proxy-service-service.yaml
diff --git a/hosting/kubernetes/budibase/templates/redis-data-persistentvolumeclaim.yaml b/charts/budibase/templates/redis-data-persistentvolumeclaim.yaml
similarity index 100%
rename from hosting/kubernetes/budibase/templates/redis-data-persistentvolumeclaim.yaml
rename to charts/budibase/templates/redis-data-persistentvolumeclaim.yaml
diff --git a/hosting/kubernetes/budibase/templates/redis-service-deployment.yaml b/charts/budibase/templates/redis-service-deployment.yaml
similarity index 100%
rename from hosting/kubernetes/budibase/templates/redis-service-deployment.yaml
rename to charts/budibase/templates/redis-service-deployment.yaml
diff --git a/hosting/kubernetes/budibase/templates/redis-service-service.yaml b/charts/budibase/templates/redis-service-service.yaml
similarity index 100%
rename from hosting/kubernetes/budibase/templates/redis-service-service.yaml
rename to charts/budibase/templates/redis-service-service.yaml
diff --git a/hosting/kubernetes/budibase/templates/secrets.yaml b/charts/budibase/templates/secrets.yaml
similarity index 100%
rename from hosting/kubernetes/budibase/templates/secrets.yaml
rename to charts/budibase/templates/secrets.yaml
diff --git a/hosting/kubernetes/budibase/templates/service.yaml b/charts/budibase/templates/service.yaml
similarity index 100%
rename from hosting/kubernetes/budibase/templates/service.yaml
rename to charts/budibase/templates/service.yaml
diff --git a/hosting/kubernetes/budibase/templates/serviceaccount.yaml b/charts/budibase/templates/serviceaccount.yaml
similarity index 100%
rename from hosting/kubernetes/budibase/templates/serviceaccount.yaml
rename to charts/budibase/templates/serviceaccount.yaml
diff --git a/hosting/kubernetes/budibase/templates/tests/test-connection.yaml b/charts/budibase/templates/tests/test-connection.yaml
similarity index 100%
rename from hosting/kubernetes/budibase/templates/tests/test-connection.yaml
rename to charts/budibase/templates/tests/test-connection.yaml
diff --git a/hosting/kubernetes/budibase/templates/worker-service-deployment.yaml b/charts/budibase/templates/worker-service-deployment.yaml
similarity index 98%
rename from hosting/kubernetes/budibase/templates/worker-service-deployment.yaml
rename to charts/budibase/templates/worker-service-deployment.yaml
index d71fc80578..8b6f5564ad 100644
--- a/hosting/kubernetes/budibase/templates/worker-service-deployment.yaml
+++ b/charts/budibase/templates/worker-service-deployment.yaml
@@ -111,7 +111,7 @@ spec:
           value: {{ .Values.globals.smtp.from | quote }}
         - name: APPS_URL
           value: http://app-service:{{ .Values.services.apps.port }}
-        image: budibase/worker:{{ .Chart.appVersion }}
+        image: budibase/worker:{{ .Values.globals.appVersion }}
         imagePullPolicy: Always
         name: bbworker
         ports:
diff --git a/hosting/kubernetes/budibase/templates/worker-service-service.yaml b/charts/budibase/templates/worker-service-service.yaml
similarity index 100%
rename from hosting/kubernetes/budibase/templates/worker-service-service.yaml
rename to charts/budibase/templates/worker-service-service.yaml
diff --git a/hosting/kubernetes/budibase/values.yaml b/charts/budibase/values.yaml
similarity index 99%
rename from hosting/kubernetes/budibase/values.yaml
rename to charts/budibase/values.yaml
index 24197383e2..b634f1581f 100644
--- a/hosting/kubernetes/budibase/values.yaml
+++ b/charts/budibase/values.yaml
@@ -85,6 +85,7 @@ tolerations: []
 affinity: {}
 
 globals:
+  appVersion: "latest"
   budibaseEnv: PRODUCTION
   enableAnalytics: true
   sentryDSN: ""
diff --git a/docs/budibase-0.1.0.tgz b/docs/budibase-0.1.0.tgz
deleted file mode 100644
index 7873874ab0..0000000000
Binary files a/docs/budibase-0.1.0.tgz and /dev/null differ
diff --git a/docs/budibase-0.1.1.tgz b/docs/budibase-0.1.1.tgz
deleted file mode 100644
index b38527c4a4..0000000000
Binary files a/docs/budibase-0.1.1.tgz and /dev/null differ
diff --git a/docs/budibase-0.2.0.tgz b/docs/budibase-0.2.0.tgz
deleted file mode 100644
index 379b92cbb7..0000000000
Binary files a/docs/budibase-0.2.0.tgz and /dev/null differ
diff --git a/docs/budibase-0.2.1.tgz b/docs/budibase-0.2.1.tgz
deleted file mode 100644
index f3423763a5..0000000000
Binary files a/docs/budibase-0.2.1.tgz and /dev/null differ
diff --git a/docs/budibase-0.2.2.tgz b/docs/budibase-0.2.2.tgz
deleted file mode 100644
index c70754eb99..0000000000
Binary files a/docs/budibase-0.2.2.tgz and /dev/null differ
diff --git a/docs/index.html b/docs/index.html
deleted file mode 100644
index 0fa6060f8f..0000000000
--- a/docs/index.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<html>
-  <head>
-    <title>Budibase Helm Chart Repo</title>
-  </head>
-  <body>
-    <h1>Budibase Charts Repo</h1>
-    <p>Point Helm at this repo to see charts.</p>
-  </body>
-</html>
\ No newline at end of file
diff --git a/docs/index.yaml b/docs/index.yaml
deleted file mode 100644
index 232f3445f9..0000000000
--- a/docs/index.yaml
+++ /dev/null
@@ -1,158 +0,0 @@
-apiVersion: v1
-entries:
-  budibase:
-  - apiVersion: v2
-    appVersion: 1.0.6
-    created: "2021-12-08T16:26:47.061065Z"
-    dependencies:
-    - condition: services.couchdb.enabled
-      name: couchdb
-      repository: https://apache.github.io/couchdb-helm
-      version: 3.3.4
-    - condition: ingress.nginx
-      name: ingress-nginx
-      repository: https://github.com/kubernetes/ingress-nginx
-      version: 3.35.0
-    description: Budibase is an open source low-code platform, helping thousands of teams build apps for their workplace in minutes.
-    digest: 9e3d5b600368a4fd65ba827986c943b65d7ffae6544b3fda0418e760866e8929
-    keywords:
-    - low-code
-    - database
-    - cluster
-    name: budibase
-    sources:
-    - https://github.com/Budibase/budibase
-    - https://budibase.com
-    type: application
-    urls:
-    - https://budibase.github.io/budibase/budibase-0.2.4.tgz
-    version: 0.2.4
-  - apiVersion: v2
-    appVersion: 0.9.169
-    created: "2021-12-08T16:26:47.055284Z"
-    dependencies:
-    - condition: services.couchdb.enabled
-      name: couchdb
-      repository: https://apache.github.io/couchdb-helm
-      version: 3.3.4
-    - condition: ingress.nginx
-      name: ingress-nginx
-      repository: https://github.com/kubernetes/ingress-nginx
-      version: 3.35.0
-    description: Budibase is an open source low-code platform, helping thousands of teams build apps for their workplace in minutes.
-    digest: 57f365d799fcaace4658883cb8ec961a7905383a68acf065af4f6e57f9878ff8
-    keywords:
-    - low-code
-    - database
-    - cluster
-    name: budibase
-    sources:
-    - https://github.com/Budibase/budibase
-    - https://budibase.com
-    type: application
-    urls:
-    - https://budibase.github.io/budibase/budibase-0.2.2.tgz
-    version: 0.2.2
-  - apiVersion: v2
-    appVersion: 0.9.163
-    created: "2021-12-08T16:26:47.051008Z"
-    dependencies:
-    - condition: services.couchdb.enabled
-      name: couchdb
-      repository: https://apache.github.io/couchdb-helm
-      version: 3.3.4
-    - condition: ingress.nginx
-      name: ingress-nginx
-      repository: https://github.com/kubernetes/ingress-nginx
-      version: 3.35.0
-    description: Budibase is an open source low-code platform, helping thousands of teams build apps for their workplace in minutes.
-    digest: ebac6d8631cc38b266c3689508b5123f5afc395f23bdb02738be26c7cae0b0b5
-    keywords:
-    - low-code
-    - database
-    - cluster
-    name: budibase
-    sources:
-    - https://github.com/Budibase/budibase
-    - https://budibase.com
-    type: application
-    urls:
-    - https://budibase.github.io/budibase/budibase-0.2.1.tgz
-    version: 0.2.1
-  - apiVersion: v2
-    appVersion: 0.9.163
-    created: "2021-12-08T16:26:47.046825Z"
-    dependencies:
-    - condition: services.couchdb.enabled
-      name: couchdb
-      repository: https://apache.github.io/couchdb-helm
-      version: 3.3.4
-    - condition: ingress.nginx
-      name: ingress-nginx
-      repository: https://github.com/kubernetes/ingress-nginx
-      version: 3.35.0
-    description: Budibase is an open source low-code platform, helping thousands of teams build apps for their workplace in minutes.
-    digest: f369536c0eac1f6959d51e8ce6d74a87a7a9df29ae84fb9cbed0a273ab77429b
-    keywords:
-    - low-code
-    - database
-    - cluster
-    name: budibase
-    sources:
-    - https://github.com/Budibase/budibase
-    - https://budibase.com
-    type: application
-    urls:
-    - https://budibase.github.io/budibase/budibase-0.2.0.tgz
-    version: 0.2.0
-  - apiVersion: v2
-    appVersion: 0.9.56
-    created: "2021-12-08T16:26:47.042113Z"
-    dependencies:
-    - condition: services.couchdb.enabled
-      name: couchdb
-      repository: https://apache.github.io/couchdb-helm
-      version: 3.3.4
-    - name: ingress-nginx
-      repository: https://github.com/kubernetes/ingress-nginx
-      version: 3.35.0
-    description: Budibase is an open source low-code platform, helping thousands of teams build apps for their workplace in minutes.
-    digest: 8dc4f2ed4d98cad5adf25936aefea680042d3e4e17832f846b961fd8708ad192
-    keywords:
-    - low-code
-    - database
-    - cluster
-    name: budibase
-    sources:
-    - https://github.com/Budibase/budibase
-    - https://budibase.com
-    type: application
-    urls:
-    - https://budibase.github.io/budibase/budibase-0.1.1.tgz
-    version: 0.1.1
-  - apiVersion: v2
-    appVersion: 0.9.56
-    created: "2021-12-08T16:26:47.036016Z"
-    dependencies:
-    - condition: services.couchdb.enabled
-      name: couchdb
-      repository: https://apache.github.io/couchdb-helm
-      version: 3.3.4
-    - name: ingress-nginx
-      repository: https://github.com/kubernetes/ingress-nginx
-      version: 3.35.0
-    description: Budibase is an open source low-code platform, helping thousands of teams build apps for their workplace in minutes.
-    digest: 08031b0803cce0eff64472e569d454d9176119c8207aa9873a9c95ee66cc7d3f
-    keywords:
-    - low-code
-    - database
-    - cluster
-    name: budibase
-    sources:
-    - https://github.com/Budibase/budibase
-    - https://budibase.com
-    type: application
-    urls:
-    - https://budibase.github.io/budibase/budibase-0.1.0.tgz
-    version: 0.1.0
-generated: "2021-12-08T16:26:47.031998Z"
diff --git a/scripts/releaseHelmChart.js b/scripts/releaseHelmChart.js
index 9c62f3dd8f..0e469bd012 100755
--- a/scripts/releaseHelmChart.js
+++ b/scripts/releaseHelmChart.js
@@ -1,5 +1,4 @@
 const yaml = require("js-yaml") 
-const { execSync } = require("child_process")
 const fs = require("fs")
 const path = require("path")
 
@@ -9,7 +8,7 @@ const UpgradeTypes = {
 	PATCH: "patch"
 }
 
-const CHART_PATH = path.join(__dirname, "../", "hosting", "kubernetes", "budibase", "Chart.yaml")
+const CHART_PATH = path.join(__dirname, "../", "charts", "budibase", "Chart.yaml")
 const UPGRADE_VERSION = process.env.BUDIBASE_RELEASE_VERSION
 const UPGRADE_TYPE = process.env.HELM_CHART_UPGRADE_TYPE || UpgradeTypes.PATCH
 
@@ -30,9 +29,6 @@ try {
 	chart.version = [major, minor, newPatch].join(".")
 	const updatedChartYaml = yaml.dump(chart)
 	fs.writeFileSync(CHART_PATH, updatedChartYaml)
-
-	// package the chart and write to docs dir
-	execSync(`helm package hosting/kubernetes/budibase --destination docs`)
 } catch (err) {
 	console.error("Error releasing helm chart")
 	throw err