diff --git a/.github/auto_assign.yml b/.github/auto_assign.yml
index de14946..85b8690 100644
--- a/.github/auto_assign.yml
+++ b/.github/auto_assign.yml
@@ -1,11 +1,7 @@
 addReviewers: true
-
-
 addAssignees: author
-
-
+numberOfReviewers: 0
 reviewers:
   - Regulus0811
   - Z00One
-
-numberOfReviewers: 2
+runOnDraft: true
\ No newline at end of file
diff --git a/.github/workflows/auto_assign.yml b/.github/workflows/auto-issue-assign.yml
similarity index 71%
rename from .github/workflows/auto_assign.yml
rename to .github/workflows/auto-issue-assign.yml
index ccaedc5..eea6f62 100644
--- a/.github/workflows/auto_assign.yml
+++ b/.github/workflows/auto-issue-assign.yml
@@ -12,6 +12,6 @@ jobs:
     - name: 'Auto-assign issue'
       uses: pozil/auto-assign-issue@v1
       with:
-          repo-token: ${{ secrets.OG_TOKEN }}
-          assignees: ${{ github.event.pull_request.user.login }}
+          repo-token: ${{ secrets.ADMIN_TOKEN }}
+          assignees: ${{ github.event.issue.user.login }}
           numOfAssignee: 1
diff --git a/.github/workflows/action.yml b/.github/workflows/auto-member.yml
similarity index 87%
rename from .github/workflows/action.yml
rename to .github/workflows/auto-member.yml
index 1ba8b92..c83f254 100644
--- a/.github/workflows/action.yml
+++ b/.github/workflows/auto-member.yml
@@ -1,4 +1,4 @@
-name: 'Auto Assign'
+name: Auto Assign & Auto Reviewer
 on:
   pull_request_target:
     types: [opened, ready_for_review]