diff --git a/.github/workflows/charts-auto-generate-docs.yaml b/.github/workflows/charts-auto-generate-docs.yaml
index 65569313..0f177b37 100644
--- a/.github/workflows/charts-auto-generate-docs.yaml
+++ b/.github/workflows/charts-auto-generate-docs.yaml
@@ -102,34 +102,56 @@ jobs:
  # Repo owner has commented /update-readme on a (fork-based) pull request
   generate-readme-fork:
     if:
-      github.event_name == 'repository_dispatch' &&
-      github.event.client_payload.slash_command.charts != ''
+      github.event_name == 'repository_dispatch'
     name: Auto-generate chart README
     runs-on: ubuntu-20.04
     steps:
-    # Check out merge commit
-    - name: Fork based /ok-to-test checkout
+    - name: Checkout
       uses: actions/checkout@v2
       with:
-        ref: 'refs/pull/${{ github.event.client_payload.pull_request.number }}/merge'
-        
+        ref: ${{ github.ref }}
+        fetch-depth: 0
+
+    - uses: dorny/paths-filter@v2
+      id: filter
+      with:
+        list-files: shell
+        filters: |
+          addedOrModified:
+            - added|modified: 'charts/**'
+
     - name: Install Helm
+      if: steps.filter.outputs.addedOrModified == 'true'
       uses: azure/setup-helm@v1
       with:
         version: v3.5.3
 
     - uses: actions/setup-python@v2
+      if: steps.filter.outputs.addedOrModified == 'true'
       with:
         python-version: 3.7
 
     - name: Install helm-docs
+      if: steps.filter.outputs.addedOrModified == 'true'
       run: |
         wget -O /tmp/helm-docs.deb  https://github.com/norwoodj/helm-docs/releases/download/v1.5.0/helm-docs_1.5.0_linux_amd64.deb
         sudo dpkg -i /tmp/helm-docs.deb
 
-    - name: Run against specified charts
+    - name: Run against changed charts
+      if: steps.filter.outputs.addedOrModified == 'true'
       run: |
-        IFS=',' read -r -a CHARTS <<< "${{ github.event.client_payload.slash_command.charts }}"
+        CHARTS=()
+        PATHS=(${{ steps.filter.outputs.addedOrModified_files }})
+        # Get only the chart paths
+        for i in "${PATHS[@]}"
+        do
+            IFS='/' read -r -a path_parts <<< "$i"
+            CHARTS+=("${path_parts[1]}/${path_parts[2]}")
+        done
+
+        # Remove duplicates
+        CHARTS=( `for i in ${CHARTS[@]}; do echo $i; done | sort -u` )
+
         for i in "${CHARTS[@]}"
         do
             echo "Rendering README for chart ${i}"
@@ -139,6 +161,7 @@ jobs:
         done
 
     - name: Create commit
+      if: steps.filter.outputs.addedOrModified == 'true'
       uses: stefanzweifel/git-auto-commit-action@v4
       with:
         commit_message: Auto-generate chart README