diff --git a/.github/labeler.yml b/.github/labeler.yml
index 05e8f1af3f..ae455a6ca9 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -6,7 +6,7 @@
 # folder names and labels; consider this documentation of that ;-)
 
 #
-# The top half of the file adds labels based on changed files
+# Add labels based on changed files using actions/labeler
 #
 
 android/: android/**
@@ -89,43 +89,3 @@ windows/config/: windows/src/desktop/**
 windows/engine/: windows/src/engine/**
 # windows/resources/
 # windows/samples/
-
-#
-# The lower part of the file adds labels based on the PR title
-#
-
-labels:
-  feat:
-    - '^feat(\(|:)'
-  fix:
-    - '^fix(\(|:)'
-  chore:
-    - '^chore(\(|:)'
-  #    "change",
-  docs:
-    - '^docs(\(|:)'
-  #    "style",
-  refactor:
-    - '^refactor(\(|:)'
-  #    "test",
-  auto:
-    - '^auto(\(|:)'
-  # Below are the scopes that we look for in the PR title
-  'android/':
-    - '\(.*android.*\):'
-  'common/':
-    - '\(.*common.*\):'
-  'developer/':
-    - '\(.*developer.*\):'
-  'ios/':
-    - '\(.*ios.*\):'
-  'linux/':
-    - '\(.*linux.*\):'
-  'mac/':
-    - '\(.*mac.*\):'
-  'oem/':
-    - '\(.*oem.*\):'
-  'web/':
-    - '\(.*web.*\):'
-  'windows/':
-    - '\(.*windows.*\):'
diff --git a/.github/multi-labeler.yml b/.github/multi-labeler.yml
new file mode 100644
index 0000000000..0ce0096aac
--- /dev/null
+++ b/.github/multi-labeler.yml
@@ -0,0 +1,63 @@
+version: v1
+
+# This file adds labels based on the scopes in resources/scopes/scopes.json and
+# resources/scopes/commit-types.json
+# Currently it must be manually kept up to date. Not all labels are added, only
+# common ones. The others are commented out. There is still some variance between
+# folder names and labels; consider this documentation of that ;-)
+
+#
+# Add labels based on the PR title using fuxingloh/multi-labeler
+#
+
+labels:
+  - label: 'feat'
+    matcher:
+      title: '^feat(\(|:)'
+  - label: 'fix'
+    matcher:
+      title: '^fix(\(|:)'
+  - label: 'chore'
+    matcher:
+      title: '^chore(\(|:)'
+  # "change",
+  - label: 'docs'
+    matcher:
+      title: '^docs(\(|:)'
+  # "style",
+  - label: 'refactor'
+    matcher:
+      title: '^refactor(\(|:)'
+  # "test",
+  - label: 'auto'
+    matcher:
+      title: '^auto(\(|:)'
+
+  # Below are the scopes that we look for in the PR title
+  - label: 'android/'
+    matcher:
+      title: '\(.*android.*\):'
+  - label: 'common/'
+    matcher:
+      title: '\(.*common.*\):'
+  - label: 'developer/'
+    matcher:
+      title: '\(.*developer.*\):'
+  - label: 'ios/'
+    matcher:
+      title: '\(.*ios.*\):'
+  - label: 'linux/'
+    matcher:
+      title: '\(.*linux.*\):'
+  - label: 'mac/'
+    matcher:
+      title: '\(.*mac.*\):'
+  - label: 'oem/'
+    matcher:
+      title: '\(.*oem.*\):'
+  - label: 'web/'
+    matcher:
+      title: '\(.*web.*\):'
+  - label: 'windows/'
+    matcher:
+      title: '\(.*windows.*\):'
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
index f01ad472ad..38e27cad8c 100644
--- a/.github/workflows/labeler.yml
+++ b/.github/workflows/labeler.yml
@@ -12,6 +12,7 @@ jobs:
         repo-token: "${{ secrets.GITHUB_TOKEN }}"
     - name: Update labels based on PR title
       id: labeler
-      uses: jimschubert/labeler-action@cfce1831f33e0e4604bbc4e6933eb2f56c2fa530
+      uses: fuxingloh/multi-labeler@8afa186ed03230c98fe24ebf9fe35093072ad46e
       with:
-        GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+        github-token: ${{secrets.GITHUB_TOKEN}}
+        config-path: .github/multi-labeler.yml