diff --git a/CODEOWNERS b/CODEOWNERS
index 51b6e877b..70b0f430a 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,7 +1,7 @@
 # https://docs.gitlab.com/ee/user/project/code_owners.html
 
 device/*/*-htc-golfu/				@Newbyte
-device/*/*-pine64-pinephone/			@craftyguy @milesalan @bshah @proycon @anjandev @StacyHarper
+device/*/*-pine64-pinephone/			@craftyguy @milesalan @bshah @proycon @anjandev @StacyHarper @Arnavion
 device/*/*-htc-m8qlul/				@Newbyte
 device/*/*-purism-librem5/			@craftyguy @bshah
 device/*/device-lg-judyln/			@Newbyte
@@ -44,11 +44,14 @@ device/*/device-huawei-plank/			@gtrxAC
 device/*/linux-huawei-plank/			@gtrxAC
 device/*/device-samsung-coreprimevelte/		@legolivesmatter @balejk
 device/*/linux-samsung-coreprimevelte/		@legolivesmatter @balejk
+device/*/linux-postmarketos-allwinner/		@Arnavion
+device/*/u-boot-pinephone/			@Arnavion
 
 main/postmarketos-update-depthcharge-kernel/	@jenneron
 main/osk-sdl/					@craftyguy
 main/postmarketos-ui-plasma-mobile/		@bshah
 main/ttyescape/					@calebccff
+main/shutdown-clear-rtc-wakealarm/		@Arnavion
 device/*/u-boot-librem5/			@craftyguy @bshah
 device/*/alsa-ucm-conf-google-kukui/		@jenneron @binarycraft
 device/*/alsa-ucm-conf-google-gru/		@jenneron