diff --git a/.gitlab/CODEOWNERS b/.gitlab/CODEOWNERS
index 6d851e1555..fe5192960b 100644
--- a/.gitlab/CODEOWNERS
+++ b/.gitlab/CODEOWNERS
@@ -1,4 +1,8 @@
-*/Cargo.toml @xMAC94x
-Cargo.toml @xMAC94x
-rust-toolchain @xMAC94x
-.gitlab/scripts/* @xMAC94x
\ No newline at end of file
+[xMAC94x] @xMAC94x
+*/Cargo.toml
+Cargo.toml
+rust-toolchain
+.gitlab/scripts/*
+
+[Other]
+/.mailmap @LunarEclipse363