diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index a543effb691..f05d256ec46 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,19 +1,19 @@
 # All markdown files
-*.md @xmarcalx @kalyazin @pb8o
+*.md @xmarcalx @kalyazin @pb8o @Manciukic
 
 # But not the ones in docs/
 docs/*.md
 
 # Except these specific ones
-docs/getting-started.md @xmarcalx @kalyazin @pb8o
-docs/prod-host-setup.md @xmarcalx @kalyazin @pb8o
+docs/getting-started.md @xmarcalx @kalyazin @pb8o @Manciukic
+docs/prod-host-setup.md @xmarcalx @kalyazin @pb8o @Manciukic
 
 # Also cover all "*policy*.md" documents
-**/*policy*.md @xmarcalx @kalyazin @pb8o
-**/*POLICY*.md @xmarcalx @kalyazin @pb8o
+**/*policy*.md @xmarcalx @kalyazin @pb8o @Manciukic
+**/*POLICY*.md @xmarcalx @kalyazin @pb8o @Manciukic
 
 # Also these non-md files in the repository root
-THIRD_PARTY @xmarcalx @kalyazin @pb8o
-LICENSE @xmarcalx @kalyazin @pb8o
-NOTICE @xmarcalx @kalyazin @pb8o
-PGP-KEY.asc @xmarcalx @kalyazin @pb8o
+THIRD_PARTY @xmarcalx @kalyazin @pb8o @Manciukic
+LICENSE @xmarcalx @kalyazin @pb8o @Manciukic
+NOTICE @xmarcalx @kalyazin @pb8o @Manciukic
+PGP-KEY.asc @xmarcalx @kalyazin @pb8o @Manciukic
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index 1ba4c85d1a0..91459ce0a8b 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -2,13 +2,12 @@
 
 Firecracker is maintained by a dedicated team within Amazon:
 
-- Alexandra Iordache <aghecen@amazon.com>
 - Babis Chalios <bchalios@amazon.com>
-- Diana Popa <dpopa@amazon.com>
 - Egor Lazarchuk <yegorlz@amazon.co.uk>
-- Jonathan Woollett-Light <jcawl@amazon.com>
+- Jack Thomson <jackabt@amazon.com>
 - Marco Cali <xmarcalx@amazon.com>
 - Nikita Kalyazin <kalyazin@amazon.com>
 - Pablo Barbachano <pablob@amazon.com>
 - Patrick Roy <roypat@amazon.com>
+- Riccardo Mancini <mancio@amazon.com>
 - Takahiro Itazuri <itazur@amazon.com>