diff --git a/CODEOWNERS b/CODEOWNERS
index 9f48ab54ba..f049da3168 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,13 +1,13 @@
 ##########################################
 #             Code Ownership
 ##########################################
-/rom/dev/ @mhatrevi @ajisaxena @vsonims @korran @JohnTraverAmd
-/kat/ @mhatrevi @ajisaxena @vsonims @korran @JohnTraverAmd
-/drivers/ @mhatrevi @ajisaxena @vsonims @korran @JohnTraverAmd @rusty1968
-/image/ @mhatrevi @ajisaxena @vsonims @korran
-/sw-emulator/ @korran @mhatrevi @ajisaxena
-/x509/ @mhatrevi @ajisaxena @vsonims @jlmahowa-amd @jhand2
-/fmc/ @FerralCoder @rusty1968 @bluegate010
-/runtime/ @jhand2 @fdamato @rusty1968 @bluegate010
-/hw-model/ @korran @fdamato @jlmahowa-amd @mhatrevi @jhand2
-/libcaliptra/ @fdamato @wmaroneAMD @JohnTraverAmd @jlmahowa-amd @korran @mhatrevi
+/rom/dev/ @mhatrevi @ajisaxena @vsonims @korran @JohnTraverAmd @swenson
+/kat/ @mhatrevi @ajisaxena @vsonims @korran @JohnTraverAmd @swenson
+/drivers/ @mhatrevi @ajisaxena @vsonims @korran @JohnTraverAmd @rusty1968 @swenson
+/image/ @mhatrevi @ajisaxena @vsonims @korran @swenson @vsonims
+/sw-emulator/ @korran @mhatrevi @ajisaxena @swenson @vsonims
+/x509/ @mhatrevi @ajisaxena @vsonims @jlmahowa-amd @jhand2 @swenson
+/fmc/ @FerralCoder @rusty1968 @bluegate010 @mhatrevi @swenson @vsonims
+/runtime/ @jhand2 @fdamato @rusty1968 @bluegate010 @mhatrevi @swenson @vsonims
+/hw-model/ @korran @fdamato @jlmahowa-amd @mhatrevi @jhand2 @swenson @vsonims
+/libcaliptra/ @fdamato @wmaroneAMD @JohnTraverAmd @jlmahowa-amd @korran @mhatrevi @swenson @vsonims