diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 14cd7dc66a1b..8afd2b9ce4a1 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -34,41 +34,41 @@
 /lldb/ @JDevlieghere
 
 # Linalg in MLIR.
-/mlir/include/mlir/Dialect/Linalg @dcaballe
-/mlir/lib/Dialect/Linalg @dcaballe
+/mlir/include/mlir/Dialect/Linalg @dcaballe @nicolasvasilache
+/mlir/lib/Dialect/Linalg @dcaballe @nicolasvasilache
 
 # Vector in MLIR.
 /mlir/**/*AMX* @dcaballe
-/mlir/**/*Neon* @banach-space @dcaballe
-/mlir/**/*SME* @banach-space @dcaballe
-/mlir/**/*SVE* @banach-space @dcaballe
-/mlir/**/*VectorInterfaces* @dcaballe
-/mlir/**/*VectorToSCF* @banach-space @dcaballe
-/mlir/**/*VectorToLLVM* @banach-space @dcaballe
-/mlir/**/*X86Vector* @dcaballe
-/mlir/include/mlir/Dialect/Vector @dcaballe
-/mlir/lib/Dialect/Vector @dcaballe
+/mlir/**/*Neon* @banach-space @dcaballe @nicolasvasilache
+/mlir/**/*SME* @banach-space @dcaballe @nicolasvasilache
+/mlir/**/*SVE* @banach-space @dcaballe @nicolasvasilache
+/mlir/**/*VectorInterfaces* @dcaballe @nicolasvasilache
+/mlir/**/*VectorToSCF* @banach-space @dcaballe @nicolasvasilache
+/mlir/**/*VectorToLLVM* @banach-space @dcaballe @nicolasvasilache
+/mlir/**/*X86Vector* @dcaballe @nicolasvasilache
+/mlir/include/mlir/Dialect/Vector @dcaballe @nicolasvasilache
+/mlir/lib/Dialect/Vector @dcaballe @nicolasvasilache
 
-/mlir/include/mlir/Interfaces/TilingInterface.* @MaheshRavishankar
+/mlir/include/mlir/Interfaces/TilingInterface.* @MaheshRavishankar @nicolasvasilache
 
-/mlir/lib/Dialect/Linalg/Transforms/DecomposeLinalgOps.cpp @MaheshRavishankar
-/mlir/lib/Dialect/Linalg/Transforms/DropUnitDims.cpp @MaheshRavishankar
-/mlir/lib/Dialect/Linalg/Transforms/ElementwiseOpFusion.cpp @MaheshRavishankar
-/mlir/lib/Dialect/MemRef/Transforms/EmulateNarrowType.cpp @MaheshRavishankar
-/mlir/lib/Dialect/Vector/Transforms/VectorEmulateNarrowType.cpp @MaheshRavishankar
-/mlir/lib/Interfaces/TilingInterface.* @MaheshRavishankar
+/mlir/lib/Dialect/Linalg/Transforms/DecomposeLinalgOps.cpp @MaheshRavishankar @nicolasvasilache
+/mlir/lib/Dialect/Linalg/Transforms/DropUnitDims.cpp @MaheshRavishankar @nicolasvasilache
+/mlir/lib/Dialect/Linalg/Transforms/ElementwiseOpFusion.cpp @MaheshRavishankar @nicolasvasilache
+/mlir/lib/Dialect/MemRef/Transforms/EmulateNarrowType.cpp @MaheshRavishankar @nicolasvasilache
+/mlir/lib/Dialect/Vector/Transforms/VectorEmulateNarrowType.cpp @MaheshRavishankar @nicolasvasilache
+/mlir/lib/Interfaces/TilingInterface.* @MaheshRavishankar @nicolasvasilache
 
 /mlir/**/*EmulateNarrowType* @hanhanW
-/mlir/lib/Dialect/Linalg/Transforms/DataLayoutPropagation.cpp @hanhanW
-/mlir/lib/Dialect/Linalg/Transforms/Transforms.cpp @hanhanW
-/mlir/lib/Dialect/Linalg/Transforms/Vectorization.cpp @hanhanW
-/mlir/lib/Dialect/Tensor/IR/TensorTilingInterfaceImpl.cpp @hanhanW
-/mlir/lib/Dialect/Tensor/Transforms/FoldIntoPackAndUnpackPatterns.cpp @hanhanW
-/mlir/lib/Dialect/Vector/Transforms/* @hanhanW
+/mlir/lib/Dialect/Linalg/Transforms/DataLayoutPropagation.cpp @hanhanW @nicolasvasilache
+/mlir/lib/Dialect/Linalg/Transforms/Transforms.cpp @hanhanW @nicolasvasilache
+/mlir/lib/Dialect/Linalg/Transforms/Vectorization.cpp @hanhanW @nicolasvasilache
+/mlir/lib/Dialect/Tensor/IR/TensorTilingInterfaceImpl.cpp @hanhanW @nicolasvasilache
+/mlir/lib/Dialect/Tensor/Transforms/FoldIntoPackAndUnpackPatterns.cpp @hanhanW @nicolasvasilache
+/mlir/lib/Dialect/Vector/Transforms/* @hanhanW @nicolasvasilache
 
 # Transform Dialect in MLIR.
-/mlir/include/mlir/Dialect/Transform/* @ftynse
-/mlir/lib/Dialect/Transform/* @ftynse
+/mlir/include/mlir/Dialect/Transform/* @ftynse @nicolasvasilache
+/mlir/lib/Dialect/Transform/* @ftynse @nicolasvasilache
 
 # SPIR-V in MLIR.
 /mlir/**/SPIRV/ @antiagainst @kuhar