diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 00000000..b9bf002e
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1 @@
+* @diogomatsubara @joelrebel @mmlb @turegano-equinix 
diff --git a/CODEOWNERS b/CODEOWNERS
deleted file mode 100644
index a23e4d78..00000000
--- a/CODEOWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-* @metal-toolbox/diogomatsubara
-* @metal-toolbox/joelrebel