diff --git a/.github/workflows/deploy-cloud.yaml b/.github/workflows/deploy-cloud.yaml
index 1f99a2919e..0951a9d9e1 100644
--- a/.github/workflows/deploy-cloud.yaml
+++ b/.github/workflows/deploy-cloud.yaml
@@ -21,12 +21,15 @@ jobs:
           -o values.production.yaml \
           -L https://api.github.com/repos/budibase/budibase-infra/contents/kubernetes/values.yaml
       
-      - name: Get the latest budibase release version if not specifically set
-        if: ${{ !github.event.inputs.version }}
+      - name: Get the latest budibase release version
         id: version
         run: | 
-           release_version=$(cat lerna.json | jq -r '.version')
-           echo "::set-output name=release_version::$release_version"
+          if [ ${{ github.event.inputs.version }} == '' ]; then
+            release_version=$(cat lerna.json | jq -r '.version')
+          else
+            release_version=${{ github.event.inputs.version }}
+          fi
+          echo "::set-output name=release_version::$release_version"
       
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v1
@@ -45,5 +48,5 @@ jobs:
           config-files: values.production.yaml
           chart-path: charts/budibase
           namespace: budibase
-          values: appVersion=v${{ github.event.inputs.version || github.steps.version.outputs.release_version }}
+          values: appVersion=v${{ github.steps.version.outputs.release_version }}
           name: budibase-prod
\ No newline at end of file
diff --git a/.github/workflows/release-selfhost.yml b/.github/workflows/release-selfhost.yml
index 2a31eccf2e..89edf9fb3b 100644
--- a/.github/workflows/release-selfhost.yml
+++ b/.github/workflows/release-selfhost.yml
@@ -40,21 +40,21 @@ jobs:
         uses: azure/setup-helm@v1
         id: helm-install
         
-      # - name: Build and release helm chart
-      #   run: | 
-      #     git config user.name "Budibase Helm Bot"
-      #     git config user.email "<>"
-      #     helm package charts/budibase
-      #     git checkout gh-pages
-      #     mv budibase-${{ github.steps.version.outputs.release_version }}.tgz docs
-      #     git add -A
-      #     git commit -m "Helm Release: ${{ github.steps.version.outputs.release_version }}"
-      #     git push
-      #   env:
-      #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Build and release helm chart
+        run: | 
+          git config user.name "Budibase Helm Bot"
+          git config user.email "<>"
+          helm package charts/budibase
+          git checkout gh-pages
+          mv budibase-${{ github.steps.version.outputs.release_version }}.tgz docs
+          git add -A
+          git commit -m "Helm Release: ${{ github.steps.version.outputs.release_version }}"
+          git push
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      # - name: Perform github release
-      #   run: | 
-      #     echo release
-      #   env:
-      #     GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
\ No newline at end of file
+      - name: Perform Github Release
+        uses: softprops/action-gh-release@v1
+        name: v${{ github.steps.version.outputs.release_version }}
+        with:
+          generate_release_notes: true
\ No newline at end of file