diff --git a/CODEOWNERS b/CODEOWNERS
index e941e15390..83d74b9538 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,7 +1,7 @@
 # Please keep users, directories and files  sorted alphabetically.
 # Directories first
 
-[Arch AArch64] @chrisj @gedare @joel @kinsey
+[Arch AArch64] @chris @gedare @joel @opticron
 /bsps/aarch64/
 /cpukit/score/cpu/aarch64/
 /spec/build/bsps/aarch64/