diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 6341a99749db..8bd78170d3b0 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -87,6 +87,7 @@ config/boards/pine64so.csc		@joshaspinall
 config/boards/pinebook-pro.conf		@TRSx80 @ahoneybun
 config/boards/qemu-uboot-arm64.csc		@rpardini
 config/boards/qemu-uboot-x86.csc		@rpardini
+config/boards/qemu-uefi-x86.conf		@davidandreoletti
 config/boards/radxa-e25.csc		@krachlatte
 config/boards/radxa-zero.conf		@clee @engineer-80
 config/boards/radxa-zero2.csc		@monkaBlyat
@@ -95,7 +96,7 @@ config/boards/renegade.conf		@Tonymac32
 config/boards/rock-3a.csc		@ZazaBR @amazingfate @catalinii @vamzii
 config/boards/rock-5a.csc		@amazingfate
 config/boards/rock-5b.csc		@amazingfate @linhz0hz
-config/boards/rock-s0.wip		@brentr
+config/boards/rock-s0.conf		@brentr
 config/boards/rock64.csc		@clee
 config/boards/rockpi-4a.csc		@clee
 config/boards/rockpi-e.conf		@krachlatte
@@ -141,7 +142,7 @@ config/kernel/linux-sunxi-*.config		@1ubuntuuser @AaronNGray @DylanHP @StephenGr
 config/kernel/linux-sunxi64-*.config		@AGM1968 @Kreyren @PanderMusubi @Tonymac32 @bigtreetech @devdotnetorg @eliasbakken @joshaspinall @krachlatte @pyavitz @schwar3kat @teknoid @viraniac
 config/kernel/linux-thead-*.config		@chainsx
 config/kernel/linux-uefi-arm64-*.config		@150balbes @PeterChrz @rpardini
-config/kernel/linux-uefi-x86-*.config		@rpardini
+config/kernel/linux-uefi-x86-*.config		@davidandreoletti @rpardini
 patch/kernel/archive/meson-s4t7-*/		@echatzip @rpardini @viraniac
 patch/kernel/archive/rockpis-*/		@brentr
 patch/kernel/archive/sm8250-*/		@FantasyGmm @amazingfate
@@ -149,7 +150,7 @@ patch/kernel/archive/sun50iw9-*/		@AGM1968 @krachlatte
 patch/kernel/archive/sun50iw9-btt-*/		@bigtreetech
 patch/kernel/archive/sunxi-*/		@1ubuntuuser @AGM1968 @AaronNGray @DylanHP @Kreyren @PanderMusubi @StephenGraf @Tonymac32 @bigtreetech @devdotnetorg @eliasbakken @joshaspinall @krachlatte @lbmendes @pyavitz @schwar3kat @sgjava @teknoid @viraniac
 patch/kernel/archive/uefi-arm64-*/		@150balbes @PeterChrz @rpardini
-patch/kernel/archive/uefi-x86-*/		@rpardini
+patch/kernel/archive/uefi-x86-*/		@davidandreoletti @rpardini
 patch/kernel/arm64-*/		@FantasyGmm @amazingfate
 patch/kernel/bcm2711-*/		@PanderMusubi @teknoid @viraniac
 patch/kernel/k3-*/		@glneo
@@ -160,6 +161,7 @@ patch/kernel/mvebu-*/		@Heisath
 patch/kernel/mvebu64-*/		@ManoftheSea
 patch/kernel/odroidxu4-*/		@joekhoobyar
 patch/kernel/rk35xx-*/		@Tonymac32 @Z-Keven @ZazaBR @amazingfate @catalinii @chainsx @efectn @hoochiwetech @igorpecovnik @krachlatte @lanefu @linhz0hz @mahdichi @monkaBlyat @rpardini @sputnik2019 @vamzii
+patch/kernel/rk35xx-vendor-*/		@Tonymac32 @Z-Keven @ZazaBR @amazingfate @catalinii @chainsx @efectn @hoochiwetech @igorpecovnik @krachlatte @lanefu @linhz0hz @mahdichi @monkaBlyat @rpardini @sputnik2019 @vamzii
 patch/kernel/rockchip-*/		@paolosabatino
 patch/kernel/rockchip-rk3588-*/		@Tonymac32 @amazingfate @efectn @igorpecovnik @lanefu @linhz0hz @rpardini
 patch/kernel/rockchip64-*/		@Manouchehri @TRSx80 @Tonymac32 @ZazaBR @ahoneybun @amazingfate @brentr @catalinii @clee @joekhoobyar @krachlatte @paolosabatino @rpardini @schwar3kat @tdleiyao @utlark @vamzii
@@ -186,4 +188,4 @@ sources/families/sun50iw9.conf		@AGM1968 @krachlatte
 sources/families/sunxi.conf		@1ubuntuuser @AaronNGray @DylanHP @StephenGraf @Tonymac32 @lbmendes @schwar3kat @sgjava @viraniac
 sources/families/sunxi64.conf		@AGM1968 @Kreyren @PanderMusubi @Tonymac32 @bigtreetech @devdotnetorg @eliasbakken @joshaspinall @krachlatte @pyavitz @schwar3kat @teknoid @viraniac
 sources/families/thead.conf		@chainsx
-sources/families/x86.conf		@rpardini
+sources/families/x86.conf		@davidandreoletti @rpardini
diff --git a/config/boards/phytiumpi.wip b/config/boards/phytiumpi.csc
similarity index 100%
rename from config/boards/phytiumpi.wip
rename to config/boards/phytiumpi.csc