diff --git a/.github/workflows/backport.yml b/.github/workflows/backport-v2.yml
similarity index 97%
rename from .github/workflows/backport.yml
rename to .github/workflows/backport-v2.yml
index 4ba4f42d00a..1ba38ba9b57 100644
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport-v2.yml
@@ -1,6 +1,6 @@
-name: Backport
+name: Backport v2
 on:
-  pull_request_target:
+  pull_request:
     types: [closed, labeled] # runs when the pull request is closed/merged or labeled (to trigger a backport in hindsight)
 permissions:
   contents: write # so it can comment
diff --git a/.github/workflows/cherry-picks.yml b/.github/workflows/cherry-picks-v2.yml
similarity index 94%
rename from .github/workflows/cherry-picks.yml
rename to .github/workflows/cherry-picks-v2.yml
index 95382458f27..08736f0034c 100644
--- a/.github/workflows/cherry-picks.yml
+++ b/.github/workflows/cherry-picks-v2.yml
@@ -1,6 +1,6 @@
-name: Cherry Pick to remote repository
+name: Cherry Pick to remote repository v2
 on:
-  pull_request_target:
+  pull_request:
     types: [closed, labeled]
   issue_comment:
     types: [created]
@@ -17,7 +17,7 @@ jobs:
     if: >
       github.ref == 'refs/heads/master' &&
       (
-        github.event_name == 'pull_request_target' &&
+        github.event_name == 'pull_request' &&
         github.event.pull_request.merged
       ) || (
         github.event_name == 'issue_comment' &&
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler-v2.yml
similarity index 75%
rename from .github/workflows/labeler.yml
rename to .github/workflows/labeler-v2.yml
index e57cd86e2b3..1ccde873a9c 100644
--- a/.github/workflows/labeler.yml
+++ b/.github/workflows/labeler-v2.yml
@@ -1,6 +1,6 @@
-name: "Pull Request Labeler"
+name: "Pull Request Labeler v2"
 on:
-- pull_request_target
+- pull_request
 
 jobs:
   labeler: