diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml
index 72bee6d..87e902d 100644
--- a/.github/workflows/build-image.yml
+++ b/.github/workflows/build-image.yml
@@ -94,7 +94,7 @@ jobs:
             > image/output/ps5-${{ matrix.distro }}.img.xz
 
       - name: Upload to R2
-        if: github.event_name != 'pull_request'
+        if: github.event_name != 'pull_request' && github.event_name != 'pull_request_target'
         env:
           RCLONE_CONFIG_R2_TYPE: s3
           RCLONE_CONFIG_R2_PROVIDER: Cloudflare
@@ -123,7 +123,7 @@ jobs:
           retention-days: 1
 
       - name: Upload to remote
-        if: github.event_name != 'pull_request'
+        if: github.event_name != 'pull_request' && github.event_name != 'pull_request_target'
         env:
           SSH_KEY: ${{ secrets.REMOTE_SSH_KEY }}
           SSH_CONFIG: ${{ secrets.REMOTE_SSH_CONFIG }}
@@ -146,7 +146,7 @@ jobs:
   release:
     needs: build
     runs-on: self-hosted
-    if: github.event_name != 'pull_request'
+    if: github.event_name != 'pull_request' && github.event_name != 'pull_request_target'
     permissions:
       contents: write
     steps:
diff --git a/.github/workflows/trigger-builds.yml b/.github/workflows/trigger-builds.yml
index bb9bd14..1556062 100644
--- a/.github/workflows/trigger-builds.yml
+++ b/.github/workflows/trigger-builds.yml
@@ -10,11 +10,7 @@ on:
 
 jobs:
   image:
-    # Only run on push, manual dispatch, OR when the 'run-ci' label is added to a PR
-    if: |
-      github.event_name == 'workflow_dispatch' ||
-      github.event_name == 'push' ||
-      (github.event_name == 'pull_request_target' && github.event.label.name == 'run-ci')
+    if: github.event.label.name == 'run-ci' || github.event_name != 'pull_request_target'
     permissions:
       contents: write
     uses: ./.github/workflows/build-image.yml