diff --git a/.github/assign-by-files.yml b/.github/assign-by-files.yml
index e59cde0e..da6f59c7 100644
--- a/.github/assign-by-files.yml
+++ b/.github/assign-by-files.yml
@@ -3,4 +3,8 @@
   - Bonrob2
 
 "docs/**/*":
-  - Bonrob2
\ No newline at end of file
+  - Bonrob2
+
+".circleci/**/*":
+  - RangerRick
+  - mershad-manesh
diff --git a/.github/label-pr.yml b/.github/label-pr.yml
deleted file mode 100644
index 6d4dfc72..00000000
--- a/.github/label-pr.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-- regExp: "^docs/.*$"
-  labels: ["docs"]
-- regExp: "^.*\\.adoc$"
-  labels: ["docs"]
\ No newline at end of file
diff --git a/.github/labeler.yml b/.github/labeler.yml
new file mode 100644
index 00000000..02965a4c
--- /dev/null
+++ b/.github/labeler.yml
@@ -0,0 +1,4 @@
+docs:
+- 'docs/*'
+- 'docs/**/*'
+- '**/*.adoc'
diff --git a/.github/workflows/auto-assign.yml b/.github/workflows/auto-assign.yml
index a9372ac2..0d7994c9 100644
--- a/.github/workflows/auto-assign.yml
+++ b/.github/workflows/auto-assign.yml
@@ -1,7 +1,7 @@
 name: "Auto Assign Pull Request"
 on:
   pull_request:
-    types: [review_requested, ready_for_review, opened, synchronize, reopened]
+    # types: [review_requested, ready_for_review, opened, synchronize, reopened]
     branches:
       - develop
       - master
@@ -10,7 +10,7 @@ jobs:
     if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     steps:
-      - uses: shufo/auto-assign-reviewer-by-files@v1.1.3
+      - uses: shufo/auto-assign-reviewer-by-files@v1.1.4
         with:
           config: ".github/assign-by-files.yml"
-          token: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
+          token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
index 8ecc77ef..1aa3ecb0 100644
--- a/.github/workflows/labeler.yml
+++ b/.github/workflows/labeler.yml
@@ -1,16 +1,16 @@
 # Workflow to associate labels automatically
 name: PR-Labeler
 # Trigger the workflow on pull request events
-on: [pull_request]
+on:
+- pull_request_target
+
 jobs:
   label:
-    runs-on: ubuntu-18.04
+    permissions:
+      contents: read
+      pull-requests: write
+    runs-on: ubuntu-latest
     steps:
-      # We need to checkout the repository to access the configured file (.github/label-pr.yml)
-      - uses: actions/checkout@v2
-      - name: Labeler
-        uses: docker://decathlon/pull-request-labeler-action:2.0.0
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          # Here we can override the path for the action configuration. If none is provided, default one is `.github/label-pr.yml`
-          CONFIG_PATH: ${{ secrets.GITHUB_WORKSPACE }}/.github/label-pr.yml
\ No newline at end of file
+      - uses: actions/labeler@v4
+        with:
+          repo-token: "${{ secrets.GITHUB_TOKEN }}"