diff --git a/.github/workflows/review-assigner.yaml b/.github/workflows/review-assigner.yaml
index 193c5c9828..d72caf17f5 100644
--- a/.github/workflows/review-assigner.yaml
+++ b/.github/workflows/review-assigner.yaml
@@ -19,33 +19,45 @@ jobs:
           script: |
                 const { PAGERDUTY_TOKEN } = process.env
                 const { api } = require('@pagerduty/pdjs');
+
+                const reviewerList = new Map([
+                    ["Sheneska Williams", "sheneska"],
+                    ["Mauricio Alvarez Leon", "BBBmau"],
+                    ["Alex Somesan", "alexsomesan"],
+                    ["Alex Pilon", "appilon"],
+                    ["John Houston", "jrhouston"],
+                    ["Aleksandr Rybolovlev", "arybolovlev"],
+                  ]);                  
+
                 const pd = api({token: PAGERDUTY_TOKEN});
-                pd.get('/schedules/id/users')
-                  .then((response) => {
-                    console.log("Assigning to " + response.users);
-                  }).catch(console.error)
+                const reviewer = ""
                 console.log("triggered by: " + context.eventName)
+                pd.get('oncalls?escalation_policy_ids%5B%5D=PH8IF3M')
+                  .then(({data}) => {
+                    reviewer = data.oncalls[0].user.summary
+                    console.log("Assigning issue to " + data.oncalls[0].user.summary);
+                  }).catch(console.error)
                  if (context.eventName == "issues"){
                      try{
                          await github.rest.issues.addAssignees({
                              owner: context.repo.owner,
                              repo: context.repo.repo,
-                             assignees: ["BBBmau"], // this will be replaced with pagerduty resp
+                             assignees: reviewerList.get(reviewer), // this will be replaced with pagerduty resp
                              issue_number: context.issue.number, // issue.number is used for both issues and PRs
                          })
                      } catch(error){
                          core.setFailed("error assigning assignee:" + error)
                      }
                  }
-                 if (context.eventName == "pull_request"){
-                     try{
-                         await github.rest.pulls.requestReviewers({
-                             owner: context.repo.owner,
-                             repo: context.repo.repo,
-                             reviewers: ["BBBmau"], // this will be replaced with pagerduty resp
-                             pull_number: (context.issue.number - 1), // for some reason we get PR+1 from context
-                         })
-                     } catch(error){
-                         core.setFailed("error assigning reviewer:" + error)
-                     }
-                 }
\ No newline at end of file
+                 //#  if (context.eventName == "pull_request"){
+                    //#      try{
+                    //#          await github.rest.pulls.requestReviewers({
+                    //#              owner: context.repo.owner,
+                    //#              repo: context.repo.repo,
+                    //#              reviewers: ["sheneska"], // this will be replaced with pagerduty resp
+                    //#              pull_number: context.issue.number, // for some reason we get PR+1 from context
+                    //#          })
+                    //#      } catch(error){
+                    //#          core.setFailed("error assigning reviewer:" + error)
+                    //#      }
+                    //#  }
\ No newline at end of file