diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index edef8bff2a7..77b944d40b7 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -7,6 +7,6 @@
 # global owners are only requested if there isn't a more specific
 # codeowner specified below. For this reason, the global codeowners
 # are often repeated in package-level definitions.
-*      @ebuchman @cmwaters @tychoish @williambanfield @creachadair @thanethomson @sergio-mena @jmalicevic
+*     @ebuchman @tendermint/tendermint-engineering
 
-/spec @cason @sergio-mena @jmalicevic @milosevic
+/spec @ebuchman @tendermint/tendermint-research @tendermint/tendermint-engineering