diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 8d45c2a88972..569ca335626a 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -12,13 +12,8 @@
 
 # Image Component (@styfle)
 
-/examples/image-component/                                   @timneutkens @ijjk @shuding @styfle
-/packages/next/build/webpack/loaders/next-image-loader.js    @timneutkens @ijjk @shuding @styfle
-/packages/next/client/image.tsx                              @timneutkens @ijjk @shuding @styfle
-/packages/next/image-types/                                  @timneutkens @ijjk @shuding @styfle
-/packages/next/server/image-config.ts                        @timneutkens @ijjk @shuding @styfle
-/packages/next/server/image-optimizer.ts                     @timneutkens @ijjk @shuding @styfle
+/**/*image*/**                                               @timneutkens @ijjk @shuding @styfle
+/packages/next/client/use-intersection.tsx                   @timneutkens @ijjk @shuding @styfle
+/packages/next/server/lib/squoosh/                           @timneutkens @ijjk @shuding @styfle
 /packages/next/server/serve-static.ts                        @timneutkens @ijjk @shuding @styfle
 /packages/next/server/config.ts                              @timneutkens @ijjk @shuding @styfle
-/test/integration/image-optimizer/                           @timneutkens @ijjk @shuding @styfle
-/test/integration/image-component/                           @timneutkens @ijjk @shuding @styfle