diff --git a/.github/workflows/fetch_all_tools.yaml b/.github/workflows/fetch_all_tools.yaml
index 2224d125..114d521e 100644
--- a/.github/workflows/fetch_all_tools.yaml
+++ b/.github/workflows/fetch_all_tools.yaml
@@ -35,10 +35,11 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: Install requirement
         run: python -m pip install -r requirements.txt
-      - name: Run script
+      - name: Run script #needs PAT to access other repos
         run: | 
-          export GITHUB_API_KEY=${{ secrets.GH_API_TOKEN }}
           bash ./bin/extract_all_tools_stepwise.sh "${{ matrix.subset }}"
+        env: 
+          GITHUB_API_KEY: ${{ secrets.GH_API_TOKEN }}
       - name: Commit all tools 
         # add or commit any changes in results if there was a change, merge with main and push as bot
         run: |
diff --git a/.github/workflows/filter_communities.yaml b/.github/workflows/filter_communities.yaml
index fba0d866..e7cc5000 100644
--- a/.github/workflows/filter_communities.yaml
+++ b/.github/workflows/filter_communities.yaml
@@ -3,10 +3,16 @@ name: Filter community tools
 on:
   workflow_dispatch:
 
-  # the workflow it triggered when all_tools_tsv is changed
+  # the workflow it triggered when all tools are fetched
+  workflow_run:
+      workflows: ["Fetch all tools"]
+      types:
+        - completed
+
+  # the workflow it also triggered when the community definitions are changed
   push:
     paths:
-    - 'results/**'
+    - 'data/communities**'
     branches: ["main"]
 
 # Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
index 0ecdbaf4..67d3814b 100644
--- a/.github/workflows/static.yml
+++ b/.github/workflows/static.yml
@@ -2,11 +2,12 @@
 name: Deploy static content to Pages
 
 on:
-  # the workflow is triggered when any of the results are changed
-  push:
-    paths:
-    - 'results/**'
-    branches: ["main"]
+
+  # the workflow it triggered when the tools where filtered
+  workflow_run:
+    workflows: ["Filter community tools"]
+    types:
+      - completed
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch: