diff --git a/config/sources/families/sun55iw3.conf b/config/sources/families/sun55iw3.conf
index 9b474dc74..a58e7a438 100644
--- a/config/sources/families/sun55iw3.conf
+++ b/config/sources/families/sun55iw3.conf
@@ -27,7 +27,7 @@ case "${BRANCH}" in
 	edge)
 		declare -g KERNEL_MAJOR_MINOR="6.16" # Major and minor versions of this kernel.
 		declare -g KERNELBRANCH="tag:v6.16"
-		KERNELPATCHDIR="archive/sunxi-${KERNEL_MAJOR_MINOR}"
+		declare -g KERNELPATCHDIR="archive/sunxi-dev-${KERNEL_MAJOR_MINOR}"
 		;;
 esac
 
diff --git a/patch/kernel/archive/sunxi-6.16/00-Add-leds-Radxa-Cubie-A5E.patch b/patch/kernel/archive/sunxi-dev-6.16/00-Add-leds-Radxa-Cubie-A5E.patch
similarity index 100%
rename from patch/kernel/archive/sunxi-6.16/00-Add-leds-Radxa-Cubie-A5E.patch
rename to patch/kernel/archive/sunxi-dev-6.16/00-Add-leds-Radxa-Cubie-A5E.patch
diff --git a/patch/kernel/archive/sunxi-6.16/01-Add-wifi-to-Radxa-Cubie-A5E.patch b/patch/kernel/archive/sunxi-dev-6.16/01-Add-wifi-to-Radxa-Cubie-A5E.patch
similarity index 100%
rename from patch/kernel/archive/sunxi-6.16/01-Add-wifi-to-Radxa-Cubie-A5E.patch
rename to patch/kernel/archive/sunxi-dev-6.16/01-Add-wifi-to-Radxa-Cubie-A5E.patch
diff --git a/patch/kernel/archive/sunxi-6.16/02-arm64-dts-allwinner-a523-add-Mali-GPU-node.patch b/patch/kernel/archive/sunxi-dev-6.16/02-arm64-dts-allwinner-a523-add-Mali-GPU-node.patch
similarity index 100%
rename from patch/kernel/archive/sunxi-6.16/02-arm64-dts-allwinner-a523-add-Mali-GPU-node.patch
rename to patch/kernel/archive/sunxi-dev-6.16/02-arm64-dts-allwinner-a523-add-Mali-GPU-node.patch
diff --git a/patch/kernel/archive/sunxi-6.16/03-arm64-dts-allwinner-a523-Add-power-controller-device-nodes.patch b/patch/kernel/archive/sunxi-dev-6.16/03-arm64-dts-allwinner-a523-Add-power-controller-device-nodes.patch
similarity index 100%
rename from patch/kernel/archive/sunxi-6.16/03-arm64-dts-allwinner-a523-Add-power-controller-device-nodes.patch
rename to patch/kernel/archive/sunxi-dev-6.16/03-arm64-dts-allwinner-a523-Add-power-controller-device-nodes.patch
diff --git a/patch/kernel/archive/sunxi-6.16/04-arm64-dts-allwinner-a523-Add-UART1-pins.patch b/patch/kernel/archive/sunxi-dev-6.16/04-arm64-dts-allwinner-a523-Add-UART1-pins.patch
similarity index 100%
rename from patch/kernel/archive/sunxi-6.16/04-arm64-dts-allwinner-a523-Add-UART1-pins.patch
rename to patch/kernel/archive/sunxi-dev-6.16/04-arm64-dts-allwinner-a523-Add-UART1-pins.patch
diff --git a/patch/kernel/archive/sunxi-6.16/05-arm64-dts-allwinner-a523-Move-mmc-nodes-to-correct-position.patch b/patch/kernel/archive/sunxi-dev-6.16/05-arm64-dts-allwinner-a523-Move-mmc-nodes-to-correct-position.patch
similarity index 100%
rename from patch/kernel/archive/sunxi-6.16/05-arm64-dts-allwinner-a523-Move-mmc-nodes-to-correct-position.patch
rename to patch/kernel/archive/sunxi-dev-6.16/05-arm64-dts-allwinner-a523-Move-mmc-nodes-to-correct-position.patch
diff --git a/patch/kernel/archive/sunxi-6.16/06-arm64-dts-allwinner-a523-Move-rgmii0-pins-to-correct-location.patch b/patch/kernel/archive/sunxi-dev-6.16/06-arm64-dts-allwinner-a523-Move-rgmii0-pins-to-correct-location.patch
similarity index 100%
rename from patch/kernel/archive/sunxi-6.16/06-arm64-dts-allwinner-a523-Move-rgmii0-pins-to-correct-location.patch
rename to patch/kernel/archive/sunxi-dev-6.16/06-arm64-dts-allwinner-a523-Move-rgmii0-pins-to-correct-location.patch
diff --git a/patch/kernel/archive/sunxi-6.16/07-arm64-dts-allwinner-a527-cubie-a5e-Add-ethernet-PHY-reset-setting.patch b/patch/kernel/archive/sunxi-dev-6.16/07-arm64-dts-allwinner-a527-cubie-a5e-Add-ethernet-PHY-reset-setting.patch
similarity index 100%
rename from patch/kernel/archive/sunxi-6.16/07-arm64-dts-allwinner-a527-cubie-a5e-Add-ethernet-PHY-reset-setting.patch
rename to patch/kernel/archive/sunxi-dev-6.16/07-arm64-dts-allwinner-a527-cubie-a5e-Add-ethernet-PHY-reset-setting.patch
diff --git a/patch/kernel/archive/sunxi-6.16/08-arm64-dts-allwinner-a527-cubie-a5e-Enable-second-Ethernet-port.patch b/patch/kernel/archive/sunxi-dev-6.16/08-arm64-dts-allwinner-a527-cubie-a5e-Enable-second-Ethernet-port.patch
similarity index 100%
rename from patch/kernel/archive/sunxi-6.16/08-arm64-dts-allwinner-a527-cubie-a5e-Enable-second-Ethernet-port.patch
rename to patch/kernel/archive/sunxi-dev-6.16/08-arm64-dts-allwinner-a527-cubie-a5e-Enable-second-Ethernet-port.patch
diff --git a/patch/kernel/archive/sunxi-6.16/09-arm64-dts-allwinner-t527-Add-OrangePi-4A-board.patch b/patch/kernel/archive/sunxi-dev-6.16/09-arm64-dts-allwinner-t527-Add-OrangePi-4A-board.patch
similarity index 100%
rename from patch/kernel/archive/sunxi-6.16/09-arm64-dts-allwinner-t527-Add-OrangePi-4A-board.patch
rename to patch/kernel/archive/sunxi-dev-6.16/09-arm64-dts-allwinner-t527-Add-OrangePi-4A-board.patch
diff --git a/patch/kernel/archive/sunxi-6.16/10-clk-sunxi-ng-sun55i-a523-r-ccu-Add-missing-PPU0-reset.patch b/patch/kernel/archive/sunxi-dev-6.16/10-clk-sunxi-ng-sun55i-a523-r-ccu-Add-missing-PPU0-reset.patch
similarity index 100%
rename from patch/kernel/archive/sunxi-6.16/10-clk-sunxi-ng-sun55i-a523-r-ccu-Add-missing-PPU0-reset.patch
rename to patch/kernel/archive/sunxi-dev-6.16/10-clk-sunxi-ng-sun55i-a523-r-ccu-Add-missing-PPU0-reset.patch
diff --git a/patch/kernel/archive/sunxi-6.16/11-dt-bindings-net-sun8i-emac-Add-A523-GMAC200-compatible.patch b/patch/kernel/archive/sunxi-dev-6.16/11-dt-bindings-net-sun8i-emac-Add-A523-GMAC200-compatible.patch
similarity index 100%
rename from patch/kernel/archive/sunxi-6.16/11-dt-bindings-net-sun8i-emac-Add-A523-GMAC200-compatible.patch
rename to patch/kernel/archive/sunxi-dev-6.16/11-dt-bindings-net-sun8i-emac-Add-A523-GMAC200-compatible.patch
diff --git a/patch/kernel/archive/sunxi-6.16/12-dt-bindings-power-Add-A523-PPU-and-PCK600-power-controllers.patch b/patch/kernel/archive/sunxi-dev-6.16/12-dt-bindings-power-Add-A523-PPU-and-PCK600-power-controllers.patch
similarity index 100%
rename from patch/kernel/archive/sunxi-6.16/12-dt-bindings-power-Add-A523-PPU-and-PCK600-power-controllers.patch
rename to patch/kernel/archive/sunxi-dev-6.16/12-dt-bindings-power-Add-A523-PPU-and-PCK600-power-controllers.patch
diff --git a/patch/kernel/archive/sunxi-6.16/13-dt-bindings-reset-sun55i-a523-r-ccu-Add-missing-PPU0-reset.patch b/patch/kernel/archive/sunxi-dev-6.16/13-dt-bindings-reset-sun55i-a523-r-ccu-Add-missing-PPU0-reset.patch
similarity index 100%
rename from patch/kernel/archive/sunxi-6.16/13-dt-bindings-reset-sun55i-a523-r-ccu-Add-missing-PPU0-reset.patch
rename to patch/kernel/archive/sunxi-dev-6.16/13-dt-bindings-reset-sun55i-a523-r-ccu-Add-missing-PPU0-reset.patch
diff --git a/patch/kernel/archive/sunxi-6.16/14-mfd-axp20x-Set-explicit-ID-for-AXP313-regulator.patch b/patch/kernel/archive/sunxi-dev-6.16/14-mfd-axp20x-Set-explicit-ID-for-AXP313-regulator.patch
similarity index 100%
rename from patch/kernel/archive/sunxi-6.16/14-mfd-axp20x-Set-explicit-ID-for-AXP313-regulator.patch
rename to patch/kernel/archive/sunxi-dev-6.16/14-mfd-axp20x-Set-explicit-ID-for-AXP313-regulator.patch
diff --git a/patch/kernel/archive/sunxi-6.16/15-mfd-axp20x-set-explicit-ID-for-regulator-cell-if-no-IRQ-line-is-present.patch b/patch/kernel/archive/sunxi-dev-6.16/15-mfd-axp20x-set-explicit-ID-for-regulator-cell-if-no-IRQ-line-is-present.patch
similarity index 100%
rename from patch/kernel/archive/sunxi-6.16/15-mfd-axp20x-set-explicit-ID-for-regulator-cell-if-no-IRQ-line-is-present.patch
rename to patch/kernel/archive/sunxi-dev-6.16/15-mfd-axp20x-set-explicit-ID-for-regulator-cell-if-no-IRQ-line-is-present.patch
diff --git a/patch/kernel/archive/sunxi-6.16/16-net-stmmac-Add-support-for-Allwinner-A523-GMAC200.patch b/patch/kernel/archive/sunxi-dev-6.16/16-net-stmmac-Add-support-for-Allwinner-A523-GMAC200.patch
similarity index 100%
rename from patch/kernel/archive/sunxi-6.16/16-net-stmmac-Add-support-for-Allwinner-A523-GMAC200.patch
rename to patch/kernel/archive/sunxi-dev-6.16/16-net-stmmac-Add-support-for-Allwinner-A523-GMAC200.patch
diff --git a/patch/kernel/archive/sunxi-6.16/17-pmdomain-sunxi-add-driver-for-Allwinner-A523's PCK-600-power-controller.patch b/patch/kernel/archive/sunxi-dev-6.16/17-pmdomain-sunxi-add-driver-for-Allwinner-A523's PCK-600-power-controller.patch
similarity index 100%
rename from patch/kernel/archive/sunxi-6.16/17-pmdomain-sunxi-add-driver-for-Allwinner-A523's PCK-600-power-controller.patch
rename to patch/kernel/archive/sunxi-dev-6.16/17-pmdomain-sunxi-add-driver-for-Allwinner-A523's PCK-600-power-controller.patch
diff --git a/patch/kernel/archive/sunxi-6.16/18-pmdomain-sunxi-sun20i-ppu-add-A523-support.patch b/patch/kernel/archive/sunxi-dev-6.16/18-pmdomain-sunxi-sun20i-ppu-add-A523-support.patch
similarity index 100%
rename from patch/kernel/archive/sunxi-6.16/18-pmdomain-sunxi-sun20i-ppu-add-A523-support.patch
rename to patch/kernel/archive/sunxi-dev-6.16/18-pmdomain-sunxi-sun20i-ppu-add-A523-support.patch
diff --git a/patch/kernel/archive/sunxi-6.16/19-regulator-axp20x-force-polyphase-setup-for-axp323.patch b/patch/kernel/archive/sunxi-dev-6.16/19-regulator-axp20x-force-polyphase-setup-for-axp323.patch
similarity index 100%
rename from patch/kernel/archive/sunxi-6.16/19-regulator-axp20x-force-polyphase-setup-for-axp323.patch
rename to patch/kernel/archive/sunxi-dev-6.16/19-regulator-axp20x-force-polyphase-setup-for-axp323.patch
diff --git a/patch/kernel/archive/sunxi-6.16/20-soc-sunxi-sram-add-entry-for-a523.patch b/patch/kernel/archive/sunxi-dev-6.16/20-soc-sunxi-sram-add-entry-for-a523.patch
similarity index 100%
rename from patch/kernel/archive/sunxi-6.16/20-soc-sunxi-sram-add-entry-for-a523.patch
rename to patch/kernel/archive/sunxi-dev-6.16/20-soc-sunxi-sram-add-entry-for-a523.patch
diff --git a/patch/kernel/archive/sunxi-6.16/21-soc-sunxi-sram-register-regmap-as-syscon.patch b/patch/kernel/archive/sunxi-dev-6.16/21-soc-sunxi-sram-register-regmap-as-syscon.patch
similarity index 100%
rename from patch/kernel/archive/sunxi-6.16/21-soc-sunxi-sram-register-regmap-as-syscon.patch
rename to patch/kernel/archive/sunxi-dev-6.16/21-soc-sunxi-sram-register-regmap-as-syscon.patch
diff --git a/patch/kernel/archive/sunxi-6.16/22-arm64-dts-allwinner-a523-enable-Mali-GPU-for-all-boards.patch b/patch/kernel/archive/sunxi-dev-6.16/22-arm64-dts-allwinner-a523-enable-Mali-GPU-for-all-boards.patch
similarity index 100%
rename from patch/kernel/archive/sunxi-6.16/22-arm64-dts-allwinner-a523-enable-Mali-GPU-for-all-boards.patch
rename to patch/kernel/archive/sunxi-dev-6.16/22-arm64-dts-allwinner-a523-enable-Mali-GPU-for-all-boards.patch
diff --git a/patch/kernel/archive/sunxi-6.16/23-arm64-dts-allwinner-a523-Add-GMAC200-ethernet-controller.patch b/patch/kernel/archive/sunxi-dev-6.16/23-arm64-dts-allwinner-a523-Add-GMAC200-ethernet-controller.patch
similarity index 100%
rename from patch/kernel/archive/sunxi-6.16/23-arm64-dts-allwinner-a523-Add-GMAC200-ethernet-controller.patch
rename to patch/kernel/archive/sunxi-dev-6.16/23-arm64-dts-allwinner-a523-Add-GMAC200-ethernet-controller.patch
diff --git a/patch/kernel/archive/sunxi-6.16/24-Enable-uart1-on-Radxa-Cubie-A5E.patch b/patch/kernel/archive/sunxi-dev-6.16/24-Enable-uart1-on-Radxa-Cubie-A5E.patch
similarity index 100%
rename from patch/kernel/archive/sunxi-6.16/24-Enable-uart1-on-Radxa-Cubie-A5E.patch
rename to patch/kernel/archive/sunxi-dev-6.16/24-Enable-uart1-on-Radxa-Cubie-A5E.patch