diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 8528efb0..cc1cad8a 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,6 +1,22 @@
-# This is a comment.
-# Each line is a file pattern followed by one or more owners.
+# Default — team reviews all feature code
+*                               @RedHatInsights/experience-ui-committers
 
-# These owners will be the default owners for everything in
-# the repo. Unless a later match takes precedence.
-*       @RedHatInsights/experience-ui-committers
+# Structural / architectural gatekeeping — broad blast radius
+/.github/                       @Bannermanj @jjaquish
+/.storybook/                    @Bannermanj @jjaquish
+/.tekton/                       @Bannermanj @jjaquish
+/.prettierrc.json               @Bannermanj @jjaquish
+/.gitignore                     @Bannermanj @jjaquish
+/config/                        @Bannermanj @jjaquish
+/deploy/                        @Bannermanj @jjaquish
+/babel.config.js                @Bannermanj @jjaquish
+/fec.config.js                  @Bannermanj @jjaquish
+/jest.config.js                 @Bannermanj @jjaquish
+/package.json                   @Bannermanj @jjaquish
+/package-lock.json              @Bannermanj @jjaquish
+/tsconfig.json                  @Bannermanj @jjaquish
+/renovate.json                  @Bannermanj @jjaquish
+
+# E2E
+/playwright/                    @Bannermanj @jjaquish
+/playwright.config.js           @Bannermanj @jjaquish
diff --git a/build-tools b/build-tools
index 8b1653c4..39d36ebb 160000
--- a/build-tools
+++ b/build-tools
@@ -1 +1 @@
-Subproject commit 8b1653c4a18b3b67fc28bbb4cb9d2b67950d0637
+Subproject commit 39d36ebb4f98e9451e540d453dd41863b5d168af