diff --git a/.changeset/three-scissors-hide.md b/.changeset/three-scissors-hide.md
new file mode 100644
index 00000000000..501ffdd5d4f
--- /dev/null
+++ b/.changeset/three-scissors-hide.md
@@ -0,0 +1,5 @@
+---
+"@primer/react": patch
+---
+
+Move Avatar component feature flag from primer_react_css_modules_team to primer_react_css_modules_staff
diff --git a/e2e/components/Avatar.test.ts b/e2e/components/Avatar.test.ts
index cbf9922090b..3fd9ec03779 100644
--- a/e2e/components/Avatar.test.ts
+++ b/e2e/components/Avatar.test.ts
@@ -13,7 +13,7 @@ test.describe('Avatar', () => {
                 id: 'components-avatar--default',
                 globals: {
                   colorScheme: theme,
-                  primer_react_css_modules_team: enabled,
+                  primer_react_css_modules_staff: enabled,
                 },
               })
 
@@ -26,7 +26,7 @@ test.describe('Avatar', () => {
                 id: 'components-avatar--default',
                 globals: {
                   colorScheme: theme,
-                  primer_react_css_modules_team: enabled,
+                  primer_react_css_modules_staff: enabled,
                 },
               })
               await expect(page).toHaveNoViolations({
@@ -49,7 +49,7 @@ test.describe('Avatar', () => {
                 id: 'components-avatar-features--size',
                 globals: {
                   colorScheme: theme,
-                  primer_react_css_modules_team: enabled,
+                  primer_react_css_modules_staff: enabled,
                 },
               })
 
@@ -62,7 +62,7 @@ test.describe('Avatar', () => {
                 id: 'components-avatar-features--size',
                 globals: {
                   colorScheme: theme,
-                  primer_react_css_modules_team: enabled,
+                  primer_react_css_modules_staff: enabled,
                 },
               })
               await expect(page).toHaveNoViolations({
@@ -85,7 +85,7 @@ test.describe('Avatar', () => {
                 id: 'components-avatar-features--size-responsive',
                 globals: {
                   colorScheme: theme,
-                  primer_react_css_modules_team: enabled,
+                  primer_react_css_modules_staff: enabled,
                 },
               })
 
@@ -98,7 +98,7 @@ test.describe('Avatar', () => {
                 id: 'components-avatar-features--size-responsive',
                 globals: {
                   colorScheme: theme,
-                  primer_react_css_modules_team: enabled,
+                  primer_react_css_modules_staff: enabled,
                 },
               })
               await expect(page).toHaveNoViolations({
@@ -121,7 +121,7 @@ test.describe('Avatar', () => {
                 id: 'components-avatar-features--square',
                 globals: {
                   colorScheme: theme,
-                  primer_react_css_modules_team: enabled,
+                  primer_react_css_modules_staff: enabled,
                 },
               })
 
@@ -134,7 +134,7 @@ test.describe('Avatar', () => {
                 id: 'components-avatar-features--square',
                 globals: {
                   colorScheme: theme,
-                  primer_react_css_modules_team: enabled,
+                  primer_react_css_modules_staff: enabled,
                 },
               })
               await expect(page).toHaveNoViolations({
diff --git a/packages/react/src/Avatar/Avatar.tsx b/packages/react/src/Avatar/Avatar.tsx
index 2f4cb8d0a5d..79d7a1dfefb 100644
--- a/packages/react/src/Avatar/Avatar.tsx
+++ b/packages/react/src/Avatar/Avatar.tsx
@@ -48,7 +48,7 @@ const Avatar = React.forwardRef<HTMLImageElement, AvatarProps>(function Avatar(
   {alt = '', size = DEFAULT_AVATAR_SIZE, square = false, sx: sxProp = defaultSxProp, className, ...rest},
   ref,
 ) {
-  const enabled = useFeatureFlag('primer_react_css_modules_team')
+  const enabled = useFeatureFlag('primer_react_css_modules_staff')
   const isResponsive = isResponsiveValue(size)
   const avatarSx = isResponsive
     ? merge<BetterCssProperties | BetterSystemStyleObject>(