diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index e40b90fd7d..1d61b1eb59 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -2,9 +2,22 @@ name: Build
 on:
   pull_request: { }
   push:
-    branches: [ master, develop ]
-  repository_dispatch:
-    types: [ element-web-notify ]
+    branches: [ master ]
+  workflow_call:
+    inputs:
+      SENTRY_ORG:
+        required: true
+        type: string
+      SENTRY_PROJECT:
+        required: true
+        type: string
+    secrets:
+      SENTRY_AUTH_TOKEN:
+        required: true
+      SENTRY_DSN:
+        required: true
+      SENTRY_URL:
+        required: true
 jobs:
   build:
     name: "Build"
@@ -24,6 +37,12 @@ jobs:
 
       - name: Build & Package
         run: "./scripts/ci_package.sh"
+        env:
+          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+          SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
+          SENTRY_URL: ${{ secrets.SENTRY_URL }}
+          SENTRY_ORG: ${{ inputs.SENTRY_ORG }}
+          SENTRY_PROJECT: ${{ inputs.SENTRY_PROJECT }}
 
       - name: Upload Artifact
         uses: actions/upload-artifact@v2
diff --git a/.github/workflows/build_develop.yaml b/.github/workflows/build_develop.yaml
new file mode 100644
index 0000000000..b699a0934e
--- /dev/null
+++ b/.github/workflows/build_develop.yaml
@@ -0,0 +1,24 @@
+# Separate to the main build workflow for access to the develop
+# secrets environment, reuses the build workflow for heavy lifting.
+name: Build and upload sourcemaps to Sentry
+on:
+  push:
+    branches: [ develop ]
+  repository_dispatch:
+    types: [ element-web-notify ]
+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:
+          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+          SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
+          SENTRY_URL: ${{ secrets.SENTRY_URL }}
+          SENTRY_ORG: sentry
+          SENTRY_PROJECT: riot-web
diff --git a/.github/workflows/sentry-sourcemaps.yaml b/.github/workflows/sentry-sourcemaps.yaml
deleted file mode 100644
index e430135dd3..0000000000
--- a/.github/workflows/sentry-sourcemaps.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-# We cannot reuse the build from the main Builder workflow
-# due to needing to inject SENTRY_ env vars into ci_package.sh
-# For security we harbor the secrets in a develop-only environment.
-name: Sentry Sourcemaps
-on:
-  push:
-    branches:
-      - develop
-  repository_dispatch:
-    types: [ element-web-notify ]
-jobs:
-  upload:
-    name: Upload
-    runs-on: ubuntu-latest
-    environment: develop
-    steps:
-      - uses: actions/checkout@v2
-
-      - uses: actions/setup-node@v3
-        with:
-          node-version: '14'
-          cache: 'yarn'
-
-      - name: Install Dependencies
-        run: "./scripts/layered.sh"
-
-      - name: Build & Package
-        run: "./scripts/ci_package.sh"
-        env:
-          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
-          SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
-          SENTRY_URL: ${{ secrets.SENTRY_URL }}
-          SENTRY_ORG: sentry
-          SENTRY_PROJECT: riot-web