diff --git a/CODEOWNERS b/CODEOWNERS
index b3280a451..ac741aaa3 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -37,7 +37,7 @@ device/*/device-google-kenzo/			@jenneron
 device/*/device-google-kodama/			@jenneron
 device/*/u-boot-snow/				@jenneron
 device/*/device-google-kevin/			@jenneron
-device/*/linux-postmarketos-exynos5/		@jenneron
+device/*/linux-postmarketos-exynos5/		@jenneron @Grimler
 device/*/device-google-krane/			@jenneron
 device/*/soc-mediatek-mt8183/			@jenneron
 device/*/u-boot-veyron-minnie/			@jenneron
@@ -65,6 +65,12 @@ device/*/device-lg-p895/			@clamor95
 device/*/firmware-asus-transformer/		@clamor95 @jenneron
 device/*/firmware-lg-x3/			@clamor95
 device/*/linux-postmarketos-grate/		@clamor95 @jenneron
+device/*/device-samsung-chagallwifi		@Grimler
+device/*/device-odroid-xu4			@Grimler
+device/*/device-samsung-klimtlte		@Grimler
+device/*/linux-samsung-klimtlte			@Grimler
+device/*/firmware-odroid-xu4			@Grimler
+device/*/linux-samsung-chagallwifi		@Grimler
 
 main/postmarketos-update-depthcharge-kernel/	@jenneron
 main/osk-sdl/					@craftyguy