diff --git a/.circleci/chart-testing.yaml b/.circleci/chart-testing.yaml
deleted file mode 100644
index 87e07618..00000000
--- a/.circleci/chart-testing.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-chart-repos:
-  - argo=https://argoproj.github.io/argo-helm
-  - minio=https://helm.min.io/
-  - dandydeveloper=https://dandydeveloper.github.io/charts/
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6c3306ec..e62f742c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -5,8 +5,8 @@ jobs:
       - image: quay.io/helmpack/chart-testing:v3.3.1
     steps:
       - checkout
-      - run: helm repo add stable https://charts.helm.sh/stable
-      - run: ct lint --config .circleci/chart-testing.yaml --lint-conf .circleci/lintconf.yaml
+      - run: ct lint --config .github/ct.yaml --lint-conf .github/lintconf.yaml
+
   # Technically this only needs to be run on master, but it's good to have it run on every PR
   # so that it is regularly tested.
   publish:
@@ -21,6 +21,7 @@ jobs:
       - checkout
       - run: helm repo add stable https://charts.helm.sh/stable
       - run: helm repo add minio https://helm.min.io/
+      - run: helm repo add argo https://argoproj.github.io/argo-helm
       - run: helm repo add dandydeveloper https://dandydeveloper.github.io/charts/
       # Only actually publish charts on master.
       - run: |
@@ -38,4 +39,4 @@ workflows:
       - lint
       - publish:
           requires:
-            - lint
+            - lint
\ No newline at end of file
diff --git a/.github/ct.yaml b/.github/ct.yaml
new file mode 100644
index 00000000..4b22c6d5
--- /dev/null
+++ b/.github/ct.yaml
@@ -0,0 +1,17 @@
+## Reference: https://github.com/helm/chart-testing/blob/master/doc/ct_lint-and-install.md
+# Don't add the 'debug' attribute, otherwise the workflow won't work anymore
+remote: origin
+chart-dirs:
+  - charts
+chart-repos:
+  - argo=https://argoproj.github.io/argo-helm
+  - minio=https://helm.min.io/
+  - dandydeveloper=https://dandydeveloper.github.io/charts/
+  - stable=https://charts.helm.sh/stable
+  - incubator=https://charts.helm.sh/incubator
+helm-extra-args: "--timeout 600s"  
+validate-chart-schema: false
+validate-maintainers: true
+validate-yaml: true
+exclude-deprecated: true
+excluded-charts: []
diff --git a/.circleci/lintconf.yaml b/.github/lintconf.yaml
similarity index 100%
rename from .circleci/lintconf.yaml
rename to .github/lintconf.yaml
diff --git a/.github/stale.yml b/.github/stale.yml
deleted file mode 100644
index b81bf109..00000000
--- a/.github/stale.yml
+++ /dev/null
@@ -1 +0,0 @@
-# See https://github.com/probot/stale
diff --git a/.github/workflows/lint-and-test.yml b/.github/workflows/lint-and-test.yml
new file mode 100644
index 00000000..30e6b63a
--- /dev/null
+++ b/.github/workflows/lint-and-test.yml
@@ -0,0 +1,45 @@
+## Reference: https://github.com/helm/chart-testing-action
+---
+name: Linting and Testing
+on: pull_request
+jobs: 
+  chart-test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Set up Helm
+        uses: azure/setup-helm@v1
+
+      - name: Set up python
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.7
+
+      - name: Setup Chart Linting
+        id: lint
+        uses: helm/chart-testing-action@v2.0.1
+
+      - name: List changed charts
+        id: list-changed
+        run: |
+          ## If executed with debug this won't work anymore.
+          changed=$(ct --config ./.github/ct.yaml list-changed)
+          charts=$(echo "$changed" | tr '\n' ' ' | xargs)
+          if [[ -n "$changed" ]]; then
+            echo "::set-output name=changed::true"
+            echo "::set-output name=changed_charts::$charts"
+          fi
+      - name: Run chart-testing (lint)
+        run: ct lint --debug --config ./.github/ct.yaml --lint-conf ./.github/lintconf.yaml
+
+      - name: Create kind cluster
+        uses: helm/kind-action@v1.1.0
+        if: steps.list-changed.outputs.changed == 'true'
+
+      - name: Run chart-testing (install)
+        run: ct install --config ./.github/ct.yaml
+        if: steps.list-changed.outputs.changed == 'true'
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index b671fc09..8b16dff4 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -1,14 +1,10 @@
 name: Mark stale issues and pull requests
-
 on:
   schedule:
   - cron: "30 1 * * *"
-
 jobs:
   stale:
-
     runs-on: ubuntu-latest
-
     steps:
     - uses: actions/stale@v3
       with:
diff --git a/charts/argo-events/Chart.yaml b/charts/argo-events/Chart.yaml
index 5def36c7..ea1878d3 100644
--- a/charts/argo-events/Chart.yaml
+++ b/charts/argo-events/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 description: A Helm chart to install Argo-Events in k8s Cluster
 name: argo-events
-version: 1.4.0
+version: 1.4.1
 keywords:
   - argo-events
   - sensor-controller
diff --git a/charts/argo-events/ci/test-values.yaml b/charts/argo-events/ci/test-values.yaml
index cd5d3916..3078a2d3 100644
--- a/charts/argo-events/ci/test-values.yaml
+++ b/charts/argo-events/ci/test-values.yaml
@@ -1,6 +1,3 @@
 serviceAccount: argo-events-sa-test
-additionalSaNamespaces:
-  - nsone
-  - nstwo
 instanceID: test-argo-events
 singleNamespace: false
diff --git a/scripts/lint.sh b/scripts/lint.sh
index 8f084c5b..c97b6863 100755
--- a/scripts/lint.sh
+++ b/scripts/lint.sh
@@ -1,19 +1,17 @@
 #!/bin/bash
+# This script runs the chart-testing tool locally. It simulates the linting that is also done by the github action. Run this without any errors before pushing.
+# Reference: https://github.com/helm/chart-testing
 set -eux
 
 SRCROOT="$(cd "$(dirname "$0")/.." && pwd)"
 
-for dir in $(find $SRCROOT/charts -mindepth 1 -maxdepth 1 -type d);
-do
-    rm -rf $dir/charts
-    name=$(basename $dir)
-    echo "Running Helm linting for $name"
-    docker run \
-        -v "$SRCROOT:/workdir" \
-        gcr.io/kubernetes-charts-ci/test-image:v3.1.0 \
-        ct \
-        lint \
-        --config .circleci/chart-testing.yaml \
-        --lint-conf .circleci/lintconf.yaml \
-        --charts "/workdir/charts/${name}"
-done
+echo -e "\n-- Linting all Helm Charts --\n"
+docker run \
+     -v "$SRCROOT:/workdir" \
+     --entrypoint /bin/sh \
+     quay.io/helmpack/chart-testing:v3.3.1 \
+     -c cd /workdir \ 
+     ct lint \
+     --config .github/ct.yaml \
+     --lint-conf .github/lintconf.yaml \
+     --debug