diff --git a/.github/labeler.yml b/.github/labeler.yml
index 70fca50f5a..ec97c49a71 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -1,12 +1,21 @@
 version: 1
 labels:
   - label: "Enhancement"
-    title: "^feat:.*"
+    titles:
+      - "^feat:.*"
+      - "^feature:.*"
   - label: "Bug"
-    title: "^fix:.*"
+    titles:
+      - "^fix:.*"
   - label: "CI"
-    title: "^test:.*"
+    titles:
+      - "^ci:.*"
+  - label: "Test"
+    titles:
+      - "^test:.*"
   - label: "skip-changelog"
-    title: "^test:.*"
-  - label: "skip-changelog"
-    title: "^doc:.*"
+    titles:
+      - "^test:.*"
+      - "^ci:.*"
+      - "^doc:.*"
+      - "^chore:.*"
diff --git a/.github/workflows/pr-labeler.yml b/.github/workflows/pr-labeler.yml
index e262601c3d..76fc33e661 100644
--- a/.github/workflows/pr-labeler.yml
+++ b/.github/workflows/pr-labeler.yml
@@ -10,6 +10,6 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: srvaroa/labeler@master
+      - uses: appsmithorg/labeler@master
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"