diff --git a/.forgejo/CODEOWNERS b/.forgejo/CODEOWNERS
index d9668b3924..2ebe56551e 100644
--- a/.forgejo/CODEOWNERS
+++ b/.forgejo/CODEOWNERS
@@ -20,9 +20,14 @@ libavcodec/*prores* @lynne
 libavcodec/*siren* @lynne
 libavcodec/*vc2* @lynne
 
-libavcodec/aarch64/* @lynne
+libavcodec/aarch64/* @lynne @mstorsjo
+libavcodec/arm/* @mstorsjo
 libavcodec/x86/* @lynne
 
+# avfilter
+# =======
+libavfilter/aarch64/* @mstorsjo
+
 # avformat
 # =======
 libavformat/iamf* @jamrial
@@ -33,9 +38,20 @@ libavutil/*crc* @lynne
 libavutil/iamf* @jamrial
 libavutil/tx* @lynne
 
-libavutil/aarch64/* @lynne
+libavutil/aarch64/* @lynne @mstorsjo
+libavutil/arm/* @mstorsjo
 libavutil/x86/* @lynne
 
+# swresample
+# =======
+libswresample/aarch64/* @mstorsjo
+libswresample/arm/* @mstorsjo
+
+# swscale
+# =======
+libswscale/aarch64/* @mstorsjo
+libswscale/arm/* @mstorsjo
+
 # Frameworks
 # ==========
 *vulkan* @lynne