diff --git a/CODEOWNERS b/CODEOWNERS
index d33d5ac2ad..14dc7b1266 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -2,17 +2,13 @@
 # Each line is a file pattern followed by one or more owners.
 # https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
 
-# WDS team
-app/client/packages/design-system/* @appsmithorg/wds
-app/client/packages/storybook/* @appsmithorg/wds
-
 app/client/.husky @KelvinOm
 app/client/.yarn @KelvinOm
 app/client/.editorconfig @KelvinOm
 app/client/.eslintrc.base.json @KelvinOm
 app/client/.eslintrc.js @KelvinOm
 app/client/.gitignore @KelvinOm
-app/client/.lintstagedrc @KelvinOm
+app/client/.lintstagedrc.json @KelvinOm
 app/client/.nvmrc @KelvinOm
 app/client/.prettierignore @KelvinOm
 app/client/.prettierrc @KelvinOm
@@ -22,6 +18,15 @@ app/client/package.json @KelvinOm
 app/client/tsconfig.json @KelvinOm
 app/client/tsconfig.path.json @KelvinOm
 
+# WDS team
+app/client/packages/design-system/* @appsmithorg/wds-team
+app/client/packages/storybook/* @appsmithorg/wds-team
+app/client/src/widgets/wds/* @appsmithorg/wds-team
+
+# Anvil-team
+app/client/src/layoutSystems/anvil/* @appsmithorg/anvil-team
+app/client/src/widgets/anvil/* @appsmithorg/anvil-team
+
 # App viewers pod
 app/client/src/widgets/* @appsmithorg/app-viewers
 app/client/src/components/propertyControls/* @appsmithorg/app-viewers
@@ -56,13 +61,12 @@ app/client/src/actions/reflowActions.ts @appsmithorg/ui-builders
 app/client/src/actions/widgetSelectionActions.ts @appsmithorg/ui-builders
 app/client/src/components/propertyControls/* @appsmithorg/ui-builders
 app/client/src/layoutSystems/* @appsmithorg/ui-builders
-app/client/src/normalizers/CanvasWidgetsNormalizer.tsx @appsmithorg/ui-builders
 app/client/src/pages/Editor/Canvas.tsx @appsmithorg/ui-builders
 app/client/src/pages/Editor/CanvasLayoutConversion/* @appsmithorg/ui-builders
 app/client/src/pages/Editor/PropertyPane/* @appsmithorg/ui-builders
+app/client/src/pages/Editor/WidgetsEditor/* @appsmithorg/ui-builders
 app/client/src/reducers/entityReducers/autoHeightReducers/* @appsmithorg/ui-builders
 app/client/src/reducers/entityReducers/canvasWidgetsReducer.ts @appsmithorg/ui-builders
-app/client/src/reducers/entityReducers/widgetConfigReducer.ts @appsmithorg/ui-builders
 app/client/src/reflow/* @appsmithorg/ui-builders
 app/client/src/sagas/AutoLayoutUpdateSagas.tsx @appsmithorg/ui-builders
 app/client/src/sagas/CanvasSagas/* @appsmithorg/ui-builders
@@ -81,7 +85,6 @@ app/client/src/selectors/autoHeightSelectors.ts @appsmithorg/ui-builders
 app/client/src/selectors/autoLayoutSelectors.tsx @appsmithorg/ui-builders
 app/client/src/selectors/canvasSelectors.ts @appsmithorg/ui-builders
 app/client/src/selectors/widgetSelectors.ts @appsmithorg/ui-builders
-app/client/src/utils/DSLConversions/* @appsmithorg/ui-builders
 app/client/src/utils/autoHeight/* @appsmithorg/ui-builders
 app/client/src/utils/hooks/autoHeightUIHooks.ts @appsmithorg/ui-builders
 app/client/src/utils/hooks/useAllowEditorDragToSelect.ts @appsmithorg/ui-builders