diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 51b7f3a136..391c69d76c 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -5,15 +5,21 @@
 
 /build/ @crazy-max @jedevc @dvdksn
 
-/compose/ @usha-mandya @aevesdocker
+/compose/ @aevesdocker
 
 /desktop/ @aevesdocker
 
-/docker-hub/ @jerae-duffin @craig-osterhout
+/desktop/extensions/ @ChrisChinchilla
+
+/desktop/extensions-sdk/ @ChrisChinchilla
+
+/scout/ @ChrisChinchilla
+
+/docker-hub/ @aevesdocker @craig-osterhout
 
 /engine/ @dvdksn
 
-/subscription/ @jerae-duffin
+/subscription/ @aevesdocker
 
 /docker-hub/publish/ @dvdksn
 
@@ -21,4 +27,3 @@
 
 /registry/ @dvdksn
 
-/atomist/ @dvdksn