diff --git a/boards.sh b/boards.sh
index a546b3bf61..cb810128ec 100644
--- a/boards.sh
+++ b/boards.sh
@@ -30,10 +30,6 @@ install_board_specific (){
 
 	[[ $(type -t install_boot_script) == function ]] && install_boot_script
 
-	# orangepi h3 temp exceptions
-	[[ $LINUXFAMILY == "sun8i" ]] && sed -i -e '1s/^/gpio set PL10\ngpio set PG11\nsetenv machid 1029\nsetenv bootm_boot_mode sec\n/' \
-		-e 's/\ disp.screen0_output_mode=1920x1080p60//' -e 's/\ hdmi.audio=EDID:0//' $CACHEDIR/sdcard/boot/boot.cmd
-
 	# if we have a special fat boot partition, alter rootfs=
 	if [[ $BOOTSIZE -gt 0 ]]; then
 		display_alert "Adjusting boot scripts" "$BOARD" "info"
@@ -41,14 +37,6 @@ install_board_specific (){
 		echo "/dev/mmcblk0p1        /boot   vfat    defaults        0       0" >> $CACHEDIR/sdcard/etc/fstab
 	fi
 
-	if [[ $BOARD == odroidxu4 && $BRANCH == next && -f $CACHEDIR/sdcard/etc/fstab ]] ; then
-		sed -e 's/mmcblk0/mmcblk1/g' -i $CACHEDIR/sdcard/etc/fstab
-	fi
-	
-	if [[ $BOARD == cubox-i && $BRANCH == next && -f $CACHEDIR/sdcard/boot/boot.cmd ]] ; then
-		sed -e 's/console=tty1 //g' -i $CACHEDIR/sdcard/boot/boot.cmd
-	fi
-	
 	# convert to uboot compatible script
 	[[ -f $CACHEDIR/sdcard/boot/boot.cmd ]] && \
 		mkimage -C none -A arm -T script -d $CACHEDIR/sdcard/boot/boot.cmd $CACHEDIR/sdcard/boot/boot.scr >> /dev/null
diff --git a/config/bootscripts/boot-odroid-xu4.ini b/config/bootscripts/boot-odroid-xu4-default.ini
similarity index 100%
rename from config/bootscripts/boot-odroid-xu4.ini
rename to config/bootscripts/boot-odroid-xu4-default.ini
diff --git a/config/sources/cubox.conf b/config/sources/cubox.conf
index 251b1ca439..86c99c46e6 100644
--- a/config/sources/cubox.conf
+++ b/config/sources/cubox.conf
@@ -53,4 +53,7 @@ family_tweaks()
 install_boot_script()
 {
 	cp $SRC/lib/config/bootscripts/boot-cubox.cmd $CACHEDIR/sdcard/boot/boot.cmd
+	if [[ $BRANCH == next && -f $CACHEDIR/sdcard/boot/boot.cmd ]]; then
+		sed -e 's/console=tty1 //g' -i $CACHEDIR/sdcard/boot/boot.cmd
+	fi
 }
diff --git a/config/sources/odroidxu4.conf b/config/sources/odroidxu4.conf
index 3e5335e5e1..49c033f330 100644
--- a/config/sources/odroidxu4.conf
+++ b/config/sources/odroidxu4.conf
@@ -39,18 +39,13 @@ family_tweaks()
 {
 	echo "blacklist ina231_sensor" > $CACHEDIR/sdcard/etc/modprobe.d/blacklist-odroid.conf
 	chroot $CACHEDIR/sdcard /bin/bash -c "apt-get -y -qq remove --auto-remove lirc >/dev/null 2>&1"
+
+	if [[ $BRANCH == next && -f $CACHEDIR/sdcard/etc/fstab ]] ; then
+		sed -e 's/mmcblk0/mmcblk1/g' -i $CACHEDIR/sdcard/etc/fstab
+	fi
 }
 
 install_boot_script()
 {
-	case $BRANCH in
-        default)
-        cp $SRC/lib/config/bootscripts/boot-odroid-xu4.ini $CACHEDIR/sdcard/boot/boot.ini
-        ;;
-
-        next)
-        cp $SRC/lib/config/bootscripts/boot-odroid-xu4-next.ini $CACHEDIR/sdcard/boot/boot.ini
-        ;;
-esac
-	
+	cp $SRC/lib/config/bootscripts/boot-odroid-xu4-${BRANCH}.ini $CACHEDIR/sdcard/boot/boot.ini
 }
diff --git a/config/sources/sunxi_common.inc b/config/sources/sunxi_common.inc
index c4f60ae1b1..5617b965f9 100644
--- a/config/sources/sunxi_common.inc
+++ b/config/sources/sunxi_common.inc
@@ -36,9 +36,15 @@ family_tweaks()
 	sed -e 's/DEVICE=""/DEVICE="\/dev\/input\/event1"/g' -i $CACHEDIR/sdcard/etc/lirc/hardware.conf
 	sed -e 's/DRIVER="UNCONFIGURED"/DRIVER="devinput"/g' -i $CACHEDIR/sdcard/etc/lirc/hardware.conf
 	cp $SRC/lib/config/lirc.conf.cubietruck $CACHEDIR/sdcard/etc/lirc/lircd.conf
+
+
 }
 
 install_boot_script()
 {
 	cp $SRC/lib/config/bootscripts/boot-sunxi.cmd $CACHEDIR/sdcard/boot/boot.cmd
+
+	# orangepi h3 temp exceptions
+	[[ $LINUXFAMILY == sun8i ]] && sed -i -e '1s/^/gpio set PL10\ngpio set PG11\nsetenv machid 1029\nsetenv bootm_boot_mode sec\n/' \
+		-e 's/\ disp.screen0_output_mode=1920x1080p60//' -e 's/\ hdmi.audio=EDID:0//' $CACHEDIR/sdcard/boot/boot.cmd
 }