diff --git a/.github/workflows/pr-check-build-size.yml b/.github/workflows/pr-check-build-size.yml
index 034349171..77450a71f 100644
--- a/.github/workflows/pr-check-build-size.yml
+++ b/.github/workflows/pr-check-build-size.yml
@@ -1,18 +1,50 @@
 name: Calculate PR build size
 on:
-  pull_request:
+  pull_request_target:
     types: [opened, reopened, synchronize]
 
 jobs:
   calculate-build-size:
     runs-on: ubuntu-latest
-
+    permissions:
+      pull-requests: read
+      contents: read
+    outputs:
+      pr_size: ${{ steps.get_sizes.outputs.pr_size }}
+      base_size: ${{ steps.get_sizes.outputs.base_size }}
     steps:
-    - name: Build and check size
-      uses: saqimtiaz/cerebrus@v3
+    - name: build-size-check
+      id: get_sizes
+      uses: TiddlyWiki/cerebrus@v4
       with:
         pr_number: ${{ github.event.pull_request.number }}
         repo: ${{ github.repository }}
         base_ref: ${{ github.base_ref }}
         github_token: ${{ secrets.GITHUB_TOKEN }}
-        mode: size:calc
\ No newline at end of file
+        mode: size:calc
+
+  dispatch-followup:
+    needs: calculate-build-size
+    runs-on: ubuntu-latest
+    permissions:
+      actions: write  # Required to dispatch another workflow
+      pull-requests: write
+      contents: read
+    steps:
+    - name: Trigger follow-up workflow
+      uses: actions/github-script@v6
+      with:
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+        script: |
+          await github.rest.actions.createWorkflowDispatch({
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            workflow_id: 'pr-comment-build-size.yml',
+            ref: 'master',
+            inputs: {
+              pr_number: '${{ github.event.pull_request.number }}',
+              base_ref: '${{ github.event.pull_request.base.ref }}',
+              pr_size: '${{ needs.calculate-build-size.outputs.pr_size }}',
+              base_size: '${{ needs.calculate-build-size.outputs.base_size }}'
+            }
+          });
\ No newline at end of file
diff --git a/.github/workflows/pr-comment-build-size.yml b/.github/workflows/pr-comment-build-size.yml
index 8680fe770..8421d99c8 100644
--- a/.github/workflows/pr-comment-build-size.yml
+++ b/.github/workflows/pr-comment-build-size.yml
@@ -1,23 +1,36 @@
 name: Comment on PR build size (Trusted workflow)
 
 on:
-  repository_dispatch:
-    types: [pr_build_size_report]
+  workflow_dispatch:
+    inputs:
+      pr_number:
+        required: true
+        type: string
+      base_ref:
+        required: true
+        type: string
+      pr_size:
+        required: true
+        type: string
+      base_size:
+        required: true
+        type: string
 
 jobs:
-  comment-build-size-on-pr:
+  comment-on-pr:
     runs-on: ubuntu-latest
     permissions:
       pull-requests: write
+      contents: read
 
     steps:
     - name: Build and check size
-      uses: TiddlyWiki/cerebrus@v3
+      uses: TiddlyWiki/cerebrus@v4
       with:
-        pr_number: ${{ github.event.client_payload.pr_number }}
+        pr_number: ${{ inputs.pr_number }}
         repo: ${{ github.repository }}
-        base_ref: ${{ github.event.client_payload.base_branch }}
+        base_ref: ${{ inputs.base_ref }}
         github_token: ${{ secrets.GITHUB_TOKEN }}
         mode: size:comment
-        pr_size: ${{ github.event.client_payload.pr_size }}
-        base_size: ${{ github.event.client_payload.base_size }}
\ No newline at end of file
+        pr_size: ${{ inputs.pr_size }}
+        base_size: ${{ inputs.base_size }}
diff --git a/.github/workflows/pr-path-validation.yml b/.github/workflows/pr-path-validation.yml
index 100101970..674a9115b 100644
--- a/.github/workflows/pr-path-validation.yml
+++ b/.github/workflows/pr-path-validation.yml
@@ -10,7 +10,7 @@ jobs:
 
     steps:
     - name: Validate PR
-      uses: TiddlyWiki/cerebrus@v3
+      uses: TiddlyWiki/cerebrus@v4
       with:
         pr_number: ${{ github.event.pull_request.number }}
         repo: ${{ github.repository }}