diff --git a/.github/workflows/deploy-cloud.yaml b/.github/workflows/deploy-cloud.yaml
index b7c4c8ae1c..a2cad316fd 100644
--- a/.github/workflows/deploy-cloud.yaml
+++ b/.github/workflows/deploy-cloud.yaml
@@ -30,13 +30,14 @@ jobs:
            echo "::set-output name=release_version::$release_version"
 
       - name: Deploy to EKS
-        uses: peymanmortazavi/eks-helm-deploy@v1
+        uses: craftech-io/eks-helm-deploy-action@v1
         with:
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-access-key-id: ${{ secrets.AWS_ACCESS__KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           aws-region: eu-west-1
           cluster-name: budibase-eks-production
           config-files: values.production.yaml
+          chart-path: charts/budibase
           namespace: budibase
           values: appVersion=v${{ github.event.inputs.version || 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 e377407b1f..1d1ee381be 100644
--- a/.github/workflows/release-selfhost.yml
+++ b/.github/workflows/release-selfhost.yml
@@ -29,8 +29,8 @@ jobs:
           docker tag budibase/worker:$release_tag latest
           
           # Push images
-          docker push budibase/apps:latest
-          docker push budibase/worker:latest
+          docker push --all-tags budibase/apps
+          docker push --all-tags budibase/apps
         env:
           DOCKER_USER: ${{ secrets.DOCKER_USERNAME }}
           DOCKER_PASSWORD: ${{ secrets.DOCKER_API_KEY }}