diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 9194fe697e..5c0e55719c 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -3,9 +3,9 @@
 
 # For more details, see https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
 
-/content/manuals/build/ @crazy-max @aevesdocker
+/content/manuals/build/ @crazy-max @ArthurFlag
 
-/content/manuals/build-cloud/ @crazy-max @aevesdocker
+/content/manuals/build-cloud/ @crazy-max @craig-osterhout
 
 /content/manuals/compose/ @aevesdocker
 
@@ -19,11 +19,11 @@
 
 /content/manuals/docker-hub/ @craig-osterhout
 
-/content/manuals/engine/ @thaJeztah @aevesdocker
+/content/manuals/engine/ @thaJeztah @ArthurFlag
 
-/content/reference/api/engine/ @thaJeztah @aevesdocker
+/content/reference/api/engine/ @thaJeztah @ArthurFlag
 
-/content/reference/cli/ @thaJeztah @aevesdocker
+/content/reference/cli/ @thaJeztah @ArthurFlag
 
 /content/manuals/subscription/ @sarahsanders-docker
 
@@ -43,4 +43,4 @@
 
 /content/manuals/ai/ @ArthurFlag
 
-/_vendor @sarahsanders-docker
+/_vendor @sarahsanders-docker @ArthurFlag