diff --git a/.github/workflows/pr-build-test-branch.yml b/.github/workflows/pr-build-test-branch.yml
index eb8b3e1d7..41b75d1c6 100644
--- a/.github/workflows/pr-build-test-branch.yml
+++ b/.github/workflows/pr-build-test-branch.yml
@@ -67,44 +67,10 @@ jobs:
       - name: Upload build to GHA
         uses: actions/upload-artifact@v4
         with:
-          name: build
+          name: ${{ github.run_id }}
           path: ${{ runner.temp }}/build.tar
 
 
-  #This is currently defunct, but kept around in case we run into issues in the future
-  # where this check might be handy, cf spammers filing PRs or something.
-  # Previously we checked is_team_member prior to doing anything else above
-  check-member:
-    name: Check organization membership
-    if: github.repository_owner == 'opencast'
-    runs-on: ubuntu-latest
-
-    # Map a step output to a job output
-    outputs:
-      is_team_member: ${{ steps.is_developer.outputs.permitted == 'true' || steps.is_committer.outputs.permitted == 'true' }}
-
-    steps:
-      - name: Check if user is Opencast developer
-        id: is_developer
-        if: ${{ github.event.pull_request.head.repo.full_name != 'opencast/editor' }}
-        uses: TheModdingInquisition/actions-team-membership@v1.0
-        with:
-          team: developers
-          # Personal Access Token with the `read:org` permission
-          token: ${{ secrets.ORGANIZATION_MEMBER_SECRET }}
-          exit: false
-
-      - name: Check if user is Opencast committer
-        id: is_committer
-        if: ${{ github.event.pull_request.head.repo.full_name != 'opencast/editor' }}
-        uses: TheModdingInquisition/actions-team-membership@v1.0
-        with:
-          team: committers
-          # Personal Access Token with the `read:org` permission
-          token: ${{ secrets.ORGANIZATION_MEMBER_SECRET }}
-          exit: false
-
-
   check-no-modified-translations:
     name: Translations only via Crowdin
     if: github.repository_owner == 'opencast'
diff --git a/.github/workflows/pr-deploy-test-branch.yml b/.github/workflows/pr-deploy-test-branch.yml
index ab290f457..d307e07a2 100644
--- a/.github/workflows/pr-deploy-test-branch.yml
+++ b/.github/workflows/pr-deploy-test-branch.yml
@@ -42,8 +42,9 @@ jobs:
       - name: Fetch build from GHA
         uses: actions/download-artifact@v4
         with:
-          name: build
-          path: ${{ runner.temp }}/build.tar
+          name: ${{ github.event.workflow_run.id }}
+          path: ${{ runner.temp }}/
+          github-token: ${{ github.token }}
           run-id: ${{ github.event.workflow_run.id }}
 
       - name: Store build in the clone
@@ -83,6 +84,7 @@ jobs:
       - name: Add comment with deployment location
         uses: thollander/actions-comment-pull-request@v3
         with:
+          pr-number: ${{ github.event.workflow_run.pull_requests[0].number }}
           comment-tag: static-test-deployment
           message: >
             This pull request is deployed at
diff --git a/.github/workflows/pr-remove-test-branch.yml b/.github/workflows/pr-remove-test-branch.yml
index b1d8042ae..712c35c98 100644
--- a/.github/workflows/pr-remove-test-branch.yml
+++ b/.github/workflows/pr-remove-test-branch.yml
@@ -32,7 +32,7 @@ jobs:
 
       - name: Clone test repository
         run: |
-          git clone -b gh-pages "git@github.com:opencast/editor-test.git" editor-test
+          git clone -b gh-pages "git@github.com:${{ github.repository_owner }}/editor-test.git" editor-test
 
       - name: Delete build if present
         working-directory: editor-test