diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 45bc4a2c..0ae5ad7d 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,4 +1,4 @@
 # See https://help.github.com/articles/about-codeowners/
 # for more info about CODEOWNERS file
 
-* @kzawora-intel @xuechendi @mswiniarsk @adobrzyn @mgawarkiewicz-intel @vivekgoe @afierka-intel
+* @mgawarkiewicz-intel @wpyszka @piotrbocian
diff --git a/.github/TESTOWNERS b/.github/TESTOWNERS
index 72856e85..d447a087 100644
--- a/.github/TESTOWNERS
+++ b/.github/TESTOWNERS
@@ -1,4 +1,4 @@
 # This file defines a list of users who can trigger Jenkins CI. 
 # Users defined in CODEOWNERS can trigger CI without being listed here.
 
-@PatrykWo @kamil-kaczor @kfojcik-intel @ksmusz @wuxun-zhang @xuechendi @attafosu @ulivne @Kacper-Pietkun
+@PatrykWo @kamil-kaczor @kfojcik-intel @ksmusz @wuxun-zhang @xuechendi @attafosu @ulivne @Kacper-Pietkun @kzawora-intel @xuechendi @mswiniarsk @adobrzyn @vivekgoe @afierka-intel