diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 0af828ea68..ee2226897c 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -20,7 +20,7 @@ on:
         required: true
 env:
   # This must be set for fetchdep.sh to get the right branch
-  PR_NUMBER: ${{ github.event.pull_requests.number }}
+  PR_NUMBER: ${{ github.event.pull_request.number }}
 jobs:
   build:
     name: "Build"
diff --git a/.github/workflows/build_develop.yaml b/.github/workflows/build_develop.yaml
index b699a0934e..8f273622bc 100644
--- a/.github/workflows/build_develop.yaml
+++ b/.github/workflows/build_develop.yaml
@@ -6,14 +6,14 @@ on:
     branches: [ develop ]
   repository_dispatch:
     types: [ element-web-notify ]
+env:
+  # This must be set for fetchdep.sh to get the right branch
+  PR_NUMBER: ${{ github.event.pull_request.number }}
 jobs:
   build:
     name: "Build"
     environment: develop
     runs-on: ubuntu-latest
-    env:
-      # This must be set for fetchdep.sh to get the right branch
-      PR_NUMBER: ${{github.event.number}}
     steps:
       - uses: ./.github/workflows/build
         secrets:
diff --git a/.github/workflows/static_analysis.yaml b/.github/workflows/static_analysis.yaml
index 7ea12f7707..98a59a1eeb 100644
--- a/.github/workflows/static_analysis.yaml
+++ b/.github/workflows/static_analysis.yaml
@@ -5,13 +5,13 @@ on:
     branches: [ develop, master ]
   repository_dispatch:
     types: [ element-web-notify ]
+env:
+  # This must be set for fetchdep.sh to get the right branch
+  PR_NUMBER: ${{ github.event.pull_request.number }}
 jobs:
   ts_lint:
     name: "Typescript Syntax Check"
     runs-on: ubuntu-latest
-    env:
-      # This must be set for fetchdep.sh to get the right branch
-      PR_NUMBER: ${{github.event.number}}
     steps:
       - uses: actions/checkout@v2
 
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index df35852817..53e82b21d8 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -5,13 +5,13 @@ on:
     branches: [ master, develop ]
   repository_dispatch:
     types: [ element-web-notify ]
+env:
+  # This must be set for fetchdep.sh to get the right branch
+  PR_NUMBER: ${{ github.event.pull_request.number }}
 jobs:
   test:
     name: "Test"
     runs-on: ubuntu-latest
-    env:
-      # This must be set for fetchdep.sh to get the right branch
-      PR_NUMBER: ${{github.event.number}}
     steps:
       - uses: actions/checkout@v2