diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 0000000000..6ff412272a
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1 @@
+*   @openedx/2U-infinity
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index e9b68a72a2..995926e854 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -25,5 +25,5 @@ Include a link to the sandbox for design changes or screenshot for before and af
 
 #### Post-merge Checklist
 
-* [ ] Deploy the changes to prod after verifying on stage or ask **@openedx/2u-vanguards** to do it. 
+* [ ] Deploy the changes to prod after verifying on stage or ask **@openedx/2u-infinity** to do it. 
 * [ ] 🎉 🙌 Celebrate! Thanks for your contribution.
diff --git a/CODEOWNERS b/CODEOWNERS
index ded2b6279d..6282e4b145 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,2 +1,2 @@
 # The following users are the owners of all frontend-app-authn files
-*       @openedx/2u-vanguards
+*       @openedx/2u-infinity
diff --git a/README.rst b/README.rst
index e2edba9259..10a79c3e6a 100644
--- a/README.rst
+++ b/README.rst
@@ -187,7 +187,7 @@ All community members are expected to follow the `Open edX Code of Conduct <http
 People
 ======
 The assigned maintainers for this component and other project details may be
-found in `Backstage <https://backstage.openedx.org/catalog/default/group/2u-vanguards>`_. Backstage pulls this data from the ``catalog-info.yaml``
+found in `Backstage <https://backstage.openedx.org/catalog/default/group/2u-infinity>`_. Backstage pulls this data from the ``catalog-info.yaml``
 file in this repo.
 
 Reporting Security Issues
diff --git a/catalog-info.yaml b/catalog-info.yaml
index 670b656bc4..7af7b88c4b 100644
--- a/catalog-info.yaml
+++ b/catalog-info.yaml
@@ -13,6 +13,6 @@ metadata:
   annotations:
     openedx.org/arch-interest-groups: ""
 spec:
-  owner: group:2u-vanguards
+  owner: group:2u-infinity
   type: 'service'
   lifecycle: 'production'
diff --git a/openedx.yaml b/openedx.yaml
index c76f5f2c12..f35f754f93 100644
--- a/openedx.yaml
+++ b/openedx.yaml
@@ -3,6 +3,6 @@
 
 nick: Authn MFE
 oeps: {}
-owner: openedx/2u-vanguards
+owner: openedx/2u-infinity
 openedx-release:
   ref: master