diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 56d5787..42eb68d 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -1,6 +1,6 @@
 name: brew pr-pull
 on:
-  pull_request_target:
+  pull_request:
     types:
       - labeled
   workflow_dispatch:
@@ -41,6 +41,7 @@ env:
 
 jobs:
   check:
+    if: (contains(github.event.pull_request.labels.*.name, 'pr-pull') || github.event.label.name == 'pr-pull')
     runs-on: ubuntu-latest
     outputs:
       bottles: ${{ steps.pr-branch-check.outputs.bottles }}
@@ -177,7 +178,7 @@ jobs:
 
   pr-pull:
     needs: check
-    if: contains(github.event.pull_request.labels.*.name, 'pr-pull')
+    if: (contains(github.event.pull_request.labels.*.name, 'pr-pull') || github.event.label.name == 'pr-pull')
     runs-on: ubuntu-latest
     steps:
       - name: Set up Homebrew
@@ -212,7 +213,6 @@ jobs:
             --clean \
             --autosquash \
             --tap="$GITHUB_REPOSITORY" \
-            --github-org="${GITHUB_REPOSITORY_OWNER}" \
             --committer="$BREWTESTBOT_NAME_EMAIL" \
             --root-url="https://ghcr.io/v2/${GITHUB_REPOSITORY_OWNER}/${GITHUB_REPOSITORY#*/homebrew-}" \
             --retain-bottle-dir \