diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 117734441..0e33bd0f6 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,2 +1 @@
-# Design infra team
-* @krzotki @Fasosnql @radekwarisch
+* @krzotki @Fasosnql @radekwarisch @bartoszlorek @mateusz-zaboj @lukaszduraj @matzimowski
diff --git a/MAINTAINERS b/MAINTAINERS
index bdabdf692..5bad9f339 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1,10 +1,7 @@
+krzotki
+Fasosnql
+radekwarisch
+mateusz-zaboj
+lukaszduraj
 matzimowski
-anna-wro
-matikrk
-ElaLukaszewicz
 bartoszlorek
-Malinicz
-domidomi
-katarzynatobis
-coderitual
-clxandstuff