diff --git a/.github/ISSUE_TEMPLATE/bug_report_ai_video.yml b/.github/ISSUE_TEMPLATE/bug_report_ai_video.yml
index b8a7c25d..bd856598 100644
--- a/.github/ISSUE_TEMPLATE/bug_report_ai_video.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report_ai_video.yml
@@ -3,6 +3,8 @@ description: Create a report to help us improve.
 labels:
   - "type: bug"
   - "AI"
+assignees:
+  - rickstaa
 body:
   - type: markdown
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/feature_request_ai.yml b/.github/ISSUE_TEMPLATE/feature_request_ai.yml
index 0c708f11..648117fa 100644
--- a/.github/ISSUE_TEMPLATE/feature_request_ai.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request_ai.yml
@@ -3,6 +3,8 @@ description: Suggest an idea for this project.
 labels:
   - "type: feature"
   - "AI"
+assignees:
+  - rickstaa
 body:
   - type: markdown
     attributes:
diff --git a/.github/workflows/labeler.yml b/.github/workflows/issue-labeler.yml
similarity index 57%
rename from .github/workflows/labeler.yml
rename to .github/workflows/issue-labeler.yml
index 0c45d708..390535f9 100644
--- a/.github/workflows/labeler.yml
+++ b/.github/workflows/issue-labeler.yml
@@ -1,9 +1,7 @@
-name: Label issues and pull requests
+name: Label issues
 on:
   issues:
     types: [opened, reopened]
-  pull_request:
-    types: [opened, reopened]
 
 jobs:
   label_issues:
@@ -18,12 +16,3 @@ jobs:
           add-labels: "status: triage"
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           ignore-if-assigned: false
-
-  label_pull_requests:
-    if: ${{ github.event_name == 'pull_request' }}
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      pull-requests: write
-    steps:
-      - uses: actions/labeler@v5
diff --git a/.github/workflows/pr-labeler.yml b/.github/workflows/pr-labeler.yml
new file mode 100644
index 00000000..26bade1d
--- /dev/null
+++ b/.github/workflows/pr-labeler.yml
@@ -0,0 +1,14 @@
+name: Label PRs
+on:
+  pull_request_target:
+    types: [opened, reopened]
+
+jobs:
+  label_pull_requests:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: write
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/labeler@v5