diff --git a/.github/auto_assign.yml b/.github/auto_assign.yml
new file mode 100644
index 000000000..a0f44d84e
--- /dev/null
+++ b/.github/auto_assign.yml
@@ -0,0 +1,18 @@
+# Set to true to add reviewers to pull requests
+addReviewers: true
+
+# Set to true to add assignees to pull requests
+addAssignees: false
+
+# A list of reviewers to be added to pull requests (GitHub user name)
+reviewers:  # gip-inclusion/admins-le-marche
+  - madjid-asa
+  - raphodn
+  - SebastienReuiller
+
+# A number of reviewers added to the pull request
+# Set 0 to add all the reviewers (default: 0)
+numberOfReviewers: 0
+
+# Set addAssignees to 'author' to set the PR creator as the assignee.
+addAssignees: author
diff --git a/.github/workflows/pr-auto-author-assign.yml b/.github/workflows/pr-auto-author-assign.yml
deleted file mode 100644
index c3f0d77ad..000000000
--- a/.github/workflows/pr-auto-author-assign.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-name: PR Auto Author Assign
-
-on:
-  pull_request_target:
-    types: [opened, reopened]
-
-permissions:
-  pull-requests: write
-
-jobs:
-  assign-author:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: toshimaru/auto-author-assign@v2.0.1
diff --git a/.github/workflows/pr-auto-reviewers-and-assignee.yml b/.github/workflows/pr-auto-reviewers-and-assignee.yml
new file mode 100644
index 000000000..66d5ffa3e
--- /dev/null
+++ b/.github/workflows/pr-auto-reviewers-and-assignee.yml
@@ -0,0 +1,11 @@
+name: PR Auto Reviewers (team) & Assignee (author)
+
+on:
+  pull_request:
+    types: [opened, ready_for_review, reopened]  # will not run on drafts
+
+jobs:
+  add-reviews:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: kentaro-m/auto-assign-action@v2.0.0