diff --git a/.github/workflows/deploy_charts.yml b/.github/workflows/deploy_charts.yml
new file mode 100644
index 0000000000..1055c699e3
--- /dev/null
+++ b/.github/workflows/deploy_charts.yml
@@ -0,0 +1,30 @@
+name: Charts-CI
+
+on: [push]
+
+jobs:
+  deploy-charts:
+    runs-on: ubuntu-20.04
+
+    steps:
+      - name: Install Helm
+        run: /bin/bash -c "curl https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash"
+
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Fetch base branch history
+        run: git fetch origin master:master
+
+      - name: Setup catalog validation
+        run: |
+          sudo apt update > /dev/null 2>&1
+          sudo apt install -y python3-all-dev python3-pip python3-setuptools > /dev/null 2>&1
+          git clone https://github.com/truenas/catalog_validation
+          sudo pip3 install --disable-pip-version-check --exists-action w -r catalog_validation/requirements.txt > /dev/null 2>&1
+          sudo pip3 install -U catalog_validation/.
+
+      - name: Validate changed charts
+        run: /bin/bash -c "PWD=${pwd}; sudo /usr/local/bin/charts_validate deploy --path $PWD"