diff --git a/.github/workflows/helm-lint.yml b/.github/workflows/helm-lint.yml
new file mode 100644
index 0000000..8e87278
--- /dev/null
+++ b/.github/workflows/helm-lint.yml
@@ -0,0 +1,20 @@
+name: Helm lint
+on:
+  pull_request:
+    paths:
+      - 'charts/**'
+      - '.github/workflows/helm-lint.yml'
+permissions:
+  contents: read
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: azure/setup-helm@v4
+      - name: Lint chart
+        run: helm lint charts
+      - name: Template (cloud)
+        run: helm template console charts -f charts/values-cloud.yaml > /dev/null
+      - name: Template (on-prem)
+        run: helm template console charts -f charts/values-onprem.yaml > /dev/null
diff --git a/.github/workflows/helm-tgz-asset.yml b/.github/workflows/helm-tgz-asset.yml
index 6e45ebd..5ce3a9b 100644
--- a/.github/workflows/helm-tgz-asset.yml
+++ b/.github/workflows/helm-tgz-asset.yml
@@ -26,13 +26,13 @@ jobs:
       - name: tar zip helm directory
         shell: bash
         run: |
-          (cd $GITHUB_WORKSPACE/kubernetes && tar -czvf device-mgmt-toolkit-helm.tar.gz charts)
+          tar -czvf device-mgmt-toolkit-helm.tar.gz charts
 
       - name: upload helm tarball release artifact
         uses: svenstaro/upload-release-action@29e53e917877a24fad85510ded594ab3c9ca12de # v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ${{ github.workspace}}/kubernetes/device-mgmt-toolkit-helm.tar.gz
+          file: ${{ github.workspace}}/device-mgmt-toolkit-helm.tar.gz
           asset_name: device-mgmt-toolkit-helm.tar.gz
           tag: ${{ github.ref }}
           overwrite: true