diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 00000000000..961b1b6cc7f
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1 @@
+* @peombwa @ddyett @georgend
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 1d3735ee470..d7e4dc6a319 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -41,8 +41,8 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         MESSAGE_TITLE: Weekly OpenApiDocs Download
         MESSAGE_BODY: "This pull request was automatically created by the GitHub Action,\n\n Contains OpenApiDocs Updates from Graph Explorer API"
-        REVIEWERS: peombwa,ddyett,darrelmiller
-        ASSIGNEDTO: finsharp
+        REVIEWERS: peombwa,ddyett,darrelmiller,georgend
+        ASSIGNEDTO: peombwa
         LABELS: generated
         BASE: dev
         HEAD: ${{steps.create_branch.outputs.branch}}