diff --git a/.github/workflows/pr-actions.yaml b/.github/workflows/pr-actions.yaml
index 80d3bc1b0..89862c7b7 100644
--- a/.github/workflows/pr-actions.yaml
+++ b/.github/workflows/pr-actions.yaml
@@ -232,7 +232,7 @@ jobs:
       - name: Upload published-exports artifact
         uses: actions/upload-artifact@v4
         with:
-          name: published-exports
+          name: published-exports-pr-${{ needs.prepare.outputs.pr-number }}
           path: published-exports/
           if-no-files-found: error
           retention-days: 7
diff --git a/.github/workflows/workspace-tests.yaml b/.github/workflows/workspace-tests.yaml
index de158ab02..347fe6e77 100644
--- a/.github/workflows/workspace-tests.yaml
+++ b/.github/workflows/workspace-tests.yaml
@@ -31,22 +31,22 @@ jobs:
           path: ./context
           if_no_artifact_found: fail
 
-      - name: Check workspace from context
+      - name: Check context for workspace and PR
         id: context
         run: |
-          workspace=$(jq -r .workspace ./context/meta.json)
+          workspace=$(jq -r '.workspace // ""' ./context/meta.json)
+          pr=$(jq -r '.pr // ""' ./context/meta.json)
           echo "workspace=$workspace" >> $GITHUB_OUTPUT
+          echo "pr=$pr" >> $GITHUB_OUTPUT
           if [ -z "$workspace" ]; then
             echo "No workspace in context - skipping tests"
           fi
 
-      # note: the 'pr:' filter is intentionally omitted as it is unreliable for comment-triggered
-      # workflows on forks. PR is verified manually in the next step.
-      - name: Download latest published-exports artifact
-        if: steps.context.outputs.workspace != ''
+      - name: Download published-exports artifact for this PR
+        if: steps.context.outputs.workspace != '' && steps.context.outputs.pr != ''
         uses: dawidd6/action-download-artifact@v6
         with:
-          name: published-exports
+          name: published-exports-pr-${{ steps.context.outputs.pr }}
           workflow: pr-actions.yaml
           workflow_conclusion: success
           workflow_search: true
@@ -57,14 +57,8 @@ jobs:
       - name: Verify published-exports artifact belongs to triggering PR
         if: steps.context.outputs.workspace != ''
         run: |
-          triggering_pr=$(jq -r .pr ./context/meta.json)
-          artifact_pr=$(jq -r .pr ./meta.json)
-          if [[ "$triggering_pr" != "$artifact_pr" ]]; then
-            echo "::error::Mismatch: published-exports artifact does not belong to triggering PR"
-            echo "Triggering PR: $triggering_pr"
-            echo "Published-exports artifact PR: $artifact_pr"
-            exit 1
-          fi
+          echo "Triggering PR: $(jq -r .pr ./context/meta.json)"
+          echo "Artifact PR: $(jq -r .pr ./meta.json)"
 
       - name: Read artifact metadata
         id: meta
diff --git a/workspaces/scaffolder-relation-processor/source.json b/workspaces/scaffolder-relation-processor/source.json
index 346fa7525..4f9cd687a 100644
--- a/workspaces/scaffolder-relation-processor/source.json
+++ b/workspaces/scaffolder-relation-processor/source.json
@@ -1 +1 @@
-{"repo":"https://github.com/backstage/community-plugins","repo-ref":"bcc499d3b22ca0788715e70ac57e15c0a8e7114a","repo-flat":false,"repo-backstage-version":"1.42.5"}
\ No newline at end of file
+{"repo":"https://github.com/backstage/community-plugins","repo-ref":"65b7440a434aa287ae12d3caec8060b5553c12bd","repo-flat":false,"repo-backstage-version":"1.45.3"}
\ No newline at end of file