diff --git a/config/boards/helios4.conf b/config/boards/helios4.conf
index ede2f23b61..fb77426c32 100644
--- a/config/boards/helios4.conf
+++ b/config/boards/helios4.conf
@@ -2,6 +2,7 @@
 BOARD_NAME="Helios4"
 BOARDFAMILY="mvebu"
 BOOTCONFIG="armada_38x_helios4_config"
+BOOTCONFIG_NEXT="helios4_defconfig"
 MODULES="mv_cesa"
 BUILD_DESKTOP="no"
 FORCE_BOOTSCRIPT_UPDATE="yes"
diff --git a/config/sources/mvebu-helios4.inc b/config/sources/mvebu-helios4.inc
index 45ef296787..95e1a50916 100644
--- a/config/sources/mvebu-helios4.inc
+++ b/config/sources/mvebu-helios4.inc
@@ -18,7 +18,6 @@ case $BRANCH in
 	BOOTBRANCH='branch:helios4'
 	BOOTDIR=$MAINLINE_UBOOT_DIR
 	BOOTSCRIPT='boot-marvell.cmd:boot.cmd'
-	BOOTCONFIG='helios4_defconfig'
 
 	UBOOT_TARGET_MAP=";;u-boot-spl.kwb:u-boot.mmc
 		;spi;u-boot-spl.kwb:u-boot.flash"