diff --git a/.github/labeler.yml b/.github/labeler.yml
index d74f7570292..ecebf65cb36 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -5,6 +5,8 @@ core:
   - tests/**/*
   - util/**/*
   - platforms/**/*
+keyboard:
+- any: ['keyboards/**/*', '!keyboards/**/keymaps/**/*']
 keymap:
   - users/**/*
   - layouts/**/*
@@ -17,3 +19,14 @@ python:
   - '**/*.py'
 documentation:
   - docs/**/*
+translation:
+  - docs/fr-fr/**/*
+  - docs/es/**/*
+  - docs/ja/**/*
+  - docs/he-il/**/*
+  - docs/pt-br/**/*
+  - docs/zh-cn/**/*
+  - docs/de/**/*
+  - docs/ru-ru/**/*
+CI:
+  - .github/**/*
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
index 7abbbeca34f..3b99a8f43e6 100644
--- a/.github/workflows/labeler.yml
+++ b/.github/workflows/labeler.yml
@@ -1,13 +1,14 @@
 name: "Pull Request Labeler"
 
 on:
-  schedule:
-  - cron: "*/10 * * * *"
+  pull_request_target:
+    types: [opened, synchronize, reopened, ready_for_review, locked]
 
 jobs:
   triage:
     runs-on: ubuntu-latest
     steps:
-    - uses: fjeremic/cron-labeler@0.2.0
+    - uses: actions/labeler@main
       with:
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        repo-token: "${{ secrets.GITHUB_TOKEN }}"
+        configuration-path: '.github/labeler.yml'