diff --git a/CODEOWNERS b/CODEOWNERS
index f1ff38cba..3d394d920 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,9 +1,25 @@
-*                                                                                 @yrezgui @kkuan2011
-/ai/                                                                              @android/devrel-ai
-/car/                                                                             @android/devrel-car
-/compose/                                                                         @android/devrel-compose
-/compose/snippets/src/main/java/com/example/compose/snippets/adaptivelayouts/     @android/devrel-adaptive-apps
-/watchface/                                                                       @android/devrel-wear
-/wear/                                                                            @android/devrel-wear
-/wearcompanion/                                                                   @android/devrel-wear
-/xr/                                                                              @android/devrel-xr
+*                                                                                   @android/devrel-snippets
+/ai/                                                                                @android/devrel-ai
+# /bluetoothle/                                                                       @android/
+/camerax/                                                                           @android/devrel-camera-media
+/cars/                                                                              @android/devrel-car
+/compose/                                                                           @android/devrel-compose
+/compose/snippets/src/main/java/com/example/compose/snippets/adaptivelayouts/       @android/devrel-adaptive-apps
+# /contacts/                                                                          @android/
+# /datastore/                                                                         @android/
+# /healthconnect/                                                                     @android/
+/identity/                                                                          @android/devrel-identity
+/installprompt/                                                                     @android/devrel-wear
+# /kmp/                                                                               @android/
+# /kotlin/                                                                            @android/
+/misc/                                                                              @android/devrel-snippets
+# /playbilling/                                                                       @android/
+# /telecom/                                                                           @android/
+/tv/                                                                                @android/devrel-tv
+# /views/                                                                             @android/
+/watchface/                                                                         @android/devrel-wear
+/watchfacepush/                                                                     @android/devrel-wear
+/wear/                                                                              @android/devrel-wear
+/wearcompanion/                                                                     @android/devrel-wear
+/xr/                                                                                @android/devrel-xr
+/gradle/libs.versions.toml                                                          @android/devrel-snippets @android/devrel-ai @android/devrel-camera-media @android/devrel-car @android/devrel-compose @android/devrel-adaptive-apps @android/devrel-identity @android/devrel-wear @android/devrel-tv @android/devrel-xr