diff --git a/CODEOWNERS b/CODEOWNERS
index 3aaa4a5d43..fdcae65290 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,11 +1,13 @@
 ##########################################
 #             Code Ownership
 ##########################################
-/rom/dev/ @mhatrevi @ajisaxena @vsonims @korran
-/kat/ @mhatrevi @ajisaxena @vsonims @korran
+/rom/dev/ @mhatrevi @ajisaxena @vsonims @korran @JohnTraverAmd
+/kat/ @mhatrevi @ajisaxena @vsonims @korran @JohnTraverAmd
 /drivers/ @mhatrevi @ajisaxena @vsonims @korran
 /image/ @mhatrevi @ajisaxena @vsonims
 /sw-emulator/ @korran @mhatrevi
-/x509/ @mhatrevi @ajisaxena @vsonims 
-# /fmc // Add FMC owners
-# /runtime // Add Runtime owners
\ No newline at end of file
+/x509/ @mhatrevi @ajisaxena @vsonims @jlmahowa-amd @jhand2
+/fmc/ @FerralCoder @rusty1968
+/runtime/ @jhand2 @fdamato @rusty1968
+/hw-model/ @korran @fdamato @jlmahowa-amd
+/libcaliptra/ @fdamato @wmaroneAMD