diff --git a/CODEOWNERS b/CODEOWNERS
index 425e321ce..b7c885664 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -9,10 +9,13 @@ device/*/device-samsung-m0/			@Newbyte
 device/*/linux-postmarketos-exynos4/		@Newbyte
 device/*/linux-postmarketos-msm8939/		@Newbyte
 device/*/linux-postmarketos-stericsson/		@Newbyte
-device/*/*-qcom-sdm845/				@calebccff @joelselvaraj
+device/*/*-qcom-sdm845/				@sdm845-mainline
 device/*/*-xiaomi-berrylium/ 			@joelselvaraj
 device/*/device-oneplus-enchilada/		@calebccff
 device/*/device-oneplus-fajita/			@calebccff
+device/*/firmware-oneplus-sdm845/		@calebccff
+device/*/device-shift-axolotl/			@calebccff @dylanvanassche
+
 main/osk-sdl/					@craftyguy
 main/postmarketos-ui-plasma-mobile/ 		@bshah
 main/ttyescape					@calebccff