diff --git a/CODEOWNERS b/CODEOWNERS
index 0d1c241a717..783eb46a78f 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -2,13 +2,13 @@
 # approval within two weeks.
 #
 # These owners will be the default owners for everything in the repo.
-*       @kroening @tautschnig @peterschrammel @chrisr-diffblue
+*       @kroening @tautschnig @peterschrammel @chrisr-diffblue @TGWDB
 
 # These files should rarely change
 
 /src/big-int/ @kroening
-/src/ansi-c/ @kroening @tautschnig @chrisr-diffblue
-/src/assembler/ @kroening @tautschnig @chrisr-diffblue
+/src/ansi-c/ @kroening @tautschnig @chrisr-diffblue @peterschrammel @thomasspriggs @TGWDB
+/src/assembler/ @kroening @tautschnig @chrisr-diffblue @peterschrammel
 /src/goto-cc/ @kroening @tautschnig @chrisr-diffblue
 /src/linking/ @kroening @tautschnig @chrisr-diffblue
 /src/memory-models/ @kroening @tautschnig
@@ -30,7 +30,7 @@
 
 # These files change frequently and changes are high-risk
 
-/src/cbmc/ @kroening @tautschnig @peterschrammel
+/src/cbmc/ @kroening @tautschnig @peterschrammel @thomasspriggs @NlightNFotis @TGWDB
 /src/goto-programs/ @kroening @tautschnig @peterschrammel
 /src/util/ @kroening @tautschnig @peterschrammel
 /src/solvers/refinement @martin-cs @romainbrenguier @peterschrammel
@@ -49,12 +49,12 @@
 /doc/cprover-manual/contracts* @tautschnig @feliperodri @SaswatPadhi
 /src/goto-diff/ @tautschnig @peterschrammel
 /src/jsil/ @kroening @tautschnig
-/src/memory-analyzer/ @tautschnig @chrisr-diffblue
+/src/memory-analyzer/ @tautschnig @chrisr-diffblue @peterschrammel
 /jbmc/src/jbmc/ @peterschrammel @romainbrenguier
 /jbmc/src/janalyzer/ @peterschrammel @romainbrenguier
-/jbmc/src/jdiff/ @peterschrammel
+/jbmc/src/jdiff/ @peterschrammel @chrisr-diffblue
 /src/cpp/ @kroening @tautschnig @peterschrammel
-/src/solvers/smt2 @kroening @martin-cs @tautschnig @peterschrammel @allredj @romainbrenguier
+/src/solvers/smt2 @kroening @martin-cs @peterschrammel @thomasspriggs @NlightNFotis @TGWDB
 /src/solvers/smt2_incremental @peterschrammel @thomasspriggs @NlightNFotis @TGWDB @chrisr-diffblue
 /src/statement-list/ @kroening @tautschnig @peterschrammel @pkesseli