diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 81d78809d..b29e7385d 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -36,8 +36,11 @@
 # ================================================
 
 #  yashim-deriv
-#  matin-binary
-#  michio-rework
+#  shafin-deriv
+#  sandeep-deriv
+#  ali-hosseini-deriv
+#  wojciech-deriv
+#  markwylde-deriv
 
 ######################################################################################################
 #
@@ -57,19 +60,6 @@
 # (in case no pattern matches a path in a PR - this should be treated as a bug and result in adding the path to CODEOWNERS)
 # ==============================================================
 
-*                                                               @matin-binary @michio-rework
-
-# ==============================================================
-#  deriv-api-docs/src/configs
-# ==============================================================
-
-/src/configs/*                                                  @michio-rework
-
-# ==============================================================
-#  deriv-api-docs/theme
-# ==============================================================
-
-/theme/*                                                         @michio-rework
-
+*                                                               @wojciech-deriv @markwylde-deriv @ali-hosseini-deriv @sandeep-deriv @shafin-deriv