diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 42481bc..5386d1c 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -11,8 +11,8 @@
 
 # CRE
 /cre/ @smartcontractkit/keystone @smartcontractkit/op-tooling
-/cre/capabilities/blockchain/ @smartcontractkit/bix-framework
-/cre/go/installer/pkg/embedded_gen.go @smartcontractkit/bix-framework
+/cre/capabilities/blockchain/ @smartcontractkit/bix-framework @smartcontractkit/keystone @smartcontractkit/op-tooling
+/cre/go/installer/pkg/embedded_gen.go @smartcontractkit/bix-framework @smartcontractkit/keystone @smartcontractkit/op-tooling
 
 /workflows/ @smartcontractkit/foundations @smartcontractkit/core @smartcontractkit/op-tooling
 /billing/ @smartcontractkit/cre-business @smartcontractkit/core @smartcontractkit/op-tooling