diff --git a/build-all.sh b/build-all.sh
index 5e2345524b..6ce76dc686 100644
--- a/build-all.sh
+++ b/build-all.sh
@@ -13,6 +13,7 @@
 source $SRC/lib/general.sh
 
 RELEASE_LIST=("trusty" "xenial" "wheezy" "jessie")
+BRANCH_LIST=("default" "next" "dev")
 
 create_images_list()
 {
@@ -20,32 +21,41 @@ create_images_list()
 		BOARD=$(basename $board | cut -d'.' -f1)
 		source $SRC/lib/config/boards/$BOARD.conf
 		if [[ -n $CLI_TARGET ]]; then
-			build_settings=($(tr ',' ' ' <<< "$CLI_TARGET"))
-			# release
-			[[ ${build_settings[0]} == "%" ]] && build_settings[0]="${RELEASE_LIST[@]}"
-			# kernel
-			# NOTE: This prevents building images with "dev" kernel - may need another solution for sun8i
-			[[ ${build_settings[1]} == "%" ]] && build_settings[1]=$(tr ',' ' ' <<< "${KERNEL_TARGET//dev}")
-			for release in ${build_settings[0]}; do
-				for kernel in ${build_settings[1]}; do
+		
+			# RELEASES : BRANCHES
+			CLI_TARGET=($(tr ':' ' ' <<< "$CLI_TARGET"))
+		
+			build_settings_target=($(tr ',' ' ' <<< "${CLI_TARGET[0]}"))
+			build_settings_branch=($(tr ',' ' ' <<< "${CLI_TARGET[1]}"))
+		
+			[[ ${build_settings_target[0]} == "%" ]] && build_settings_target[0]="${RELEASE_LIST[@]}"
+			[[ ${build_settings_branch[0]} == "%" ]] && build_settings_branch[0]="${BRANCH_LIST[@]}"
+			
+			for release in ${build_settings_target[@]}; do
+				for kernel in ${build_settings_branch[@]}; do
 					buildlist+=("$BOARD $kernel $release no")
 				done
 			done
 		fi
 		if [[ -n $DESKTOP_TARGET ]]; then
-			build_settings=($(tr ',' ' ' <<< "$DESKTOP_TARGET"))
-			# release
-			[[ ${build_settings[0]} == "%" ]] && build_settings[0]="${RELEASE_LIST[@]}"
-			# kernel
-			# NOTE: This prevents building images with "dev" kernel - may need another solution for sun8i
-			[[ ${build_settings[1]} == "%" ]] && build_settings[1]=$(tr ',' ' ' <<< "${KERNEL_TARGET//dev}")
-			for release in ${build_settings[0]}; do
-				for kernel in ${build_settings[1]}; do
+			
+			# RELEASES : BRANCHES
+			DESKTOP_TARGET=($(tr ':' ' ' <<< "$DESKTOP_TARGET"))
+			
+			build_settings_target=($(tr ',' ' ' <<< "${DESKTOP_TARGET[0]}"))
+			build_settings_branch=($(tr ',' ' ' <<< "${DESKTOP_TARGET[1]}"))
+			
+			[[ ${build_settings_target[0]} == "%" ]] && build_settings_target[0]="${RELEASE_LIST[@]}"
+			[[ ${build_settings_branch[0]} == "%" ]] && build_settings_branch[0]="${BRANCH_LIST[@]}"
+		
+			for release in ${build_settings_target[@]}; do
+				for kernel in ${build_settings_branch[@]}; do
 					buildlist+=("$BOARD $kernel $release yes")
 				done
 			done
+
 		fi
-		unset CLI_TARGET DESKTOP_TARGET KERNEL_TARGET
+		unset CLI_TARGET CLI_BRANCH DESKTOP_TARGET DESKTOP_BRANCH KERNEL_TARGET
 	done
 }
 
diff --git a/compile.sh b/compile.sh
index 46c586d34b..35397a01f0 100755
--- a/compile.sh
+++ b/compile.sh
@@ -15,7 +15,6 @@
 # for detailed explanation of these parameters
 
 # method
-KERNEL_ONLY="no"					# build only kernel
 KERNEL_CONFIGURE="no"					# want to change my default configuration
 CLEAN_LEVEL="make,debs"					# comma-separated list of clean targets: "make" = make clean for selected kernel and u-boot,
 							# "debs" = delete pckages in "./output/debs" for current branch and family,
@@ -101,4 +100,4 @@ fi
 
 # If you are committing new version of this file, increment VERSION
 # Only integers are supported
-# VERSION=16
+# VERSION=17
diff --git a/config/boards/armada.conf b/config/boards/armada.conf
index fcaada9469..fa2b7ae13b 100644
--- a/config/boards/armada.conf
+++ b/config/boards/armada.conf
@@ -1,8 +1,8 @@
 # Marvell Armada 38x
-KERNEL_TARGET="default,next"
 LINUXFAMILY=marvell
 BOOTCONFIG=armada_38x_clearfog_config
 MODULES=""
 MODULES_NEXT=""
 SERIALCON=ttyS0
-CLI_TARGET="%,%"
+CLI_TARGET="jessie,trusty:default,next"
+KERNEL_TARGET="default,next"
\ No newline at end of file
diff --git a/config/boards/bananapim2.conf b/config/boards/bananapim2.conf
index e5e9f5b7fa..832543c70c 100644
--- a/config/boards/bananapim2.conf
+++ b/config/boards/bananapim2.conf
@@ -1,8 +1,8 @@
 # A31 quad core 1Gb SoC Wifi
-KERNEL_TARGET="next,dev"
 LINUXFAMILY=sun6i
 BOOTCONFIG=Sinovoip_BPI_M2_defconfig
 MODULES="hci_uart gpio_sunxi rfcomm hidp sunxi-ir bonding spi_sun7i 8021q a20_tp"
 MODULES_NEXT="brcmfmac bonding"
-CLI_TARGET="%,%"
-DESKTOP_TARGET="jessie,next"
+CLI_TARGET="wheezy,jessie,trusty:next"
+DESKTOP_TARGET="jessie:next"
+KERNEL_TARGET="next,dev"
\ No newline at end of file
diff --git a/config/boards/bananapim2plus.conf b/config/boards/bananapim2plus.conf
index 73a9bb9f87..0fa66d2c4a 100644
--- a/config/boards/bananapim2plus.conf
+++ b/config/boards/bananapim2plus.conf
@@ -1,5 +1,4 @@
 # H3 quad core 1Gb SoC Wifi
-KERNEL_TARGET="default,dev"
 LINUXFAMILY=sun8i
 BOOTCONFIG=Sinovoip_BPI_M2_plus_defconfig
 MODULES="#gpio_sunxi #w1-sunxi #w1-gpio #w1-therm #ap6211"
@@ -7,5 +6,6 @@ MODULES_NEXT="brcmfmac"
 CPUMIN="240000"
 CPUMAX="1200000"
 GOVERNOR=interactive
-CLI_TARGET="%,%"
-DESKTOP_TARGET="jessie,default"
+CLI_TARGET="jessie:default,dev"
+DESKTOP_TARGET="jessie:default"
+KERNEL_TARGET="default,dev"
\ No newline at end of file
diff --git a/config/boards/bananapipro.conf b/config/boards/bananapipro.conf
index 495b849e74..35b9db109a 100644
--- a/config/boards/bananapipro.conf
+++ b/config/boards/bananapipro.conf
@@ -1,8 +1,8 @@
 # A20 dual core 1Gb SoC
-KERNEL_TARGET="default,next,dev"
 LINUXFAMILY=sun7i
 BOOTCONFIG=Bananapro_defconfig
 MODULES="hci_uart gpio_sunxi rfcomm hidp sunxi-ir bonding spi_sun7i 8021q a20_tp #ap6211"
 MODULES_NEXT="brcmfmac bonding"
-CLI_TARGET="%,%"
-DESKTOP_TARGET="jessie,%"
+CLI_TARGET="wheezy,jessie,trusty:default,next"
+DESKTOP_TARGET="jessie:default,next"
+KERNEL_TARGET="default,next,dev"
\ No newline at end of file
diff --git a/config/boards/cubieboard.conf b/config/boards/cubieboard.conf
index 75593a556a..b769f04648 100644
--- a/config/boards/cubieboard.conf
+++ b/config/boards/cubieboard.conf
@@ -1,8 +1,8 @@
 # A10 single core 1Gb SoC
-KERNEL_TARGET="default,next,dev"
 LINUXFAMILY=sun4i
 BOOTCONFIG=Cubieboard_config
 MODULES="hci_uart gpio_sunxi rfcomm hidp sunxi-ir bonding spi_sunxi"
 MODULES_NEXT="bonding"
-CLI_TARGET="%,%"
-DESKTOP_TARGET="jessie,%"
+CLI_TARGET="wheezy,jessie,trusty:default,next"
+DESKTOP_TARGET="jessie:default,next"
+KERNEL_TARGET="default,next,dev"
\ No newline at end of file
diff --git a/config/boards/cubieboard2.conf b/config/boards/cubieboard2.conf
index 0636db9fd8..53b6591131 100644
--- a/config/boards/cubieboard2.conf
+++ b/config/boards/cubieboard2.conf
@@ -1,8 +1,8 @@
 # A20 dual core 1Gb SoC
-KERNEL_TARGET="default,next,dev"
 LINUXFAMILY=sun7i
 BOOTCONFIG=Cubieboard2_config
 MODULES="hci_uart gpio_sunxi rfcomm hidp sunxi-ir bonding spi_sun7i"
 MODULES_NEXT="bonding"
-CLI_TARGET="%,%"
-DESKTOP_TARGET="jessie,%"
+CLI_TARGET="wheezy,jessie,trusty:default,next"
+DESKTOP_TARGET="jessie:default,next"
+KERNEL_TARGET="default,next,dev"
\ No newline at end of file
diff --git a/config/boards/cubieboard4.conf b/config/boards/cubieboard4.conf
index 342cb0d3fe..18c44bcd2c 100644
--- a/config/boards/cubieboard4.conf
+++ b/config/boards/cubieboard4.conf
@@ -1,9 +1,9 @@
 # A80 SoC 8 cores 2GB RAM Wi-Fi
-KERNEL_TARGET=""
+KERNEL_TARGET="next,dev"
 LINUXFAMILY=sun9i
 BOOTCONFIG=Cubieboard4_defconfig
 CPUMIN=1200000
 CPUMAX=1800000
 GOVERNOR=ondemand
 CLI_TARGET=""
-DESKTOP_TARGET=""
+DESKTOP_TARGET=""
\ No newline at end of file
diff --git a/config/boards/cubietruck.conf b/config/boards/cubietruck.conf
index fe4e22e86d..9dd4ac4adb 100644
--- a/config/boards/cubietruck.conf
+++ b/config/boards/cubietruck.conf
@@ -1,8 +1,8 @@
 # A20 dual core 2Gb SoC Wifi
-KERNEL_TARGET="default,next,dev"
 LINUXFAMILY=sun7i
 BOOTCONFIG=Cubietruck_config
 MODULES="hci_uart gpio_sunxi rfcomm hidp sunxi-ir bonding spi_sun7i ap6210"
 MODULES_NEXT="brcmfmac rfcomm hidp bonding"
-CLI_TARGET="%,%"
-DESKTOP_TARGET="jessie,%"
+CLI_TARGET="wheezy,jessie,trusty:default,next"
+DESKTOP_TARGET="jessie:default,next"
+KERNEL_TARGET="default,next,dev"
\ No newline at end of file
diff --git a/config/boards/cubox-i.conf b/config/boards/cubox-i.conf
index b6e1de3d5d..2f1df0bc15 100644
--- a/config/boards/cubox-i.conf
+++ b/config/boards/cubox-i.conf
@@ -1,9 +1,9 @@
 # Freescale iMx dual/quad core Wifi
-KERNEL_TARGET="default,next,dev"
 LINUXFAMILY=cubox
 BOOTCONFIG=mx6_cubox-i_config
 MODULES="bonding"
 MODULES_NEXT="bonding"
 SERIALCON=ttymxc0
-CLI_TARGET="%,%"
-DESKTOP_TARGET="jessie,%"
+CLI_TARGET="wheezy,jessie,trusty:default,next"
+DESKTOP_TARGET="jessie:default"
+KERNEL_TARGET="default,next,dev"
\ No newline at end of file
diff --git a/config/boards/guitar.conf b/config/boards/guitar.conf
index 1863cee91d..5bb61e4eea 100644
--- a/config/boards/guitar.conf
+++ b/config/boards/guitar.conf
@@ -1,5 +1,4 @@
 # S500 Lemaker Guitar Action quad core
-KERNEL_TARGET="default"
 LINUXFAMILY=s500
 OFFSET=16
 BOOTSIZE=32
@@ -7,3 +6,6 @@ BOOTCONFIG=s500_defconfig
 MODULES="ethernet wlan_8723bs"
 MODULES_NEXT=""
 SERIALCON="ttyS3"
+CLI_TARGET="jessie:default"
+DESKTOP_TARGET="jessie:default"
+KERNEL_TARGET="default"
\ No newline at end of file
diff --git a/config/boards/lamobo-r1.conf b/config/boards/lamobo-r1.conf
index 0698e525e8..a9f7b5b840 100644
--- a/config/boards/lamobo-r1.conf
+++ b/config/boards/lamobo-r1.conf
@@ -1,6 +1,6 @@
 # A20 dual core 1Gb SoC Switch
-KERNEL_TARGET="default,next,dev"
 LINUXFAMILY=sun7i
 BOOTCONFIG=Lamobo_R1_defconfig
 MODULES="hci_uart gpio_sunxi rfcomm hidp sunxi-ir bonding spi_sun7i 8021q"
-CLI_TARGET="%,%"
+CLI_TARGET="wheezy,jessie,trusty:default,next"
+KERNEL_TARGET="default,next,dev"
\ No newline at end of file
diff --git a/config/boards/lime-a10.conf b/config/boards/lime-a10.conf
index 9a05cc7784..9a61c61746 100644
--- a/config/boards/lime-a10.conf
+++ b/config/boards/lime-a10.conf
@@ -1,8 +1,8 @@
 # A10 single core 512Mb SoC
-KERNEL_TARGET="default,next,dev"
 LINUXFAMILY=sun4i
 BOOTCONFIG=A10-OLinuXino-Lime_defconfig
 MODULES="hci_uart gpio_sunxi rfcomm hidp bonding spi_sun7i 8021q a20_tp"
 MODULES_NEXT="bonding"
-CLI_TARGET="%,%"
-DESKTOP_TARGET="jessie,%"
+CLI_TARGET="wheezy,jessie,trusty:default,next"
+DESKTOP_TARGET="jessie:default,next"
+KERNEL_TARGET="default,next,dev"
\ No newline at end of file
diff --git a/config/boards/lime.conf b/config/boards/lime.conf
index c63e53a44c..d08fbce037 100644
--- a/config/boards/lime.conf
+++ b/config/boards/lime.conf
@@ -1,8 +1,8 @@
 # A20 dual core 512Mb SoC
-KERNEL_TARGET="default,next,dev"
 LINUXFAMILY=sun7i
 BOOTCONFIG=A20-OLinuXino-Lime_defconfig
 MODULES="hci_uart gpio_sunxi rfcomm hidp bonding spi_sun7i 8021q a20_tp"
 MODULES_NEXT="bonding"
-CLI_TARGET="%,%"
-DESKTOP_TARGET="jessie,%"
+CLI_TARGET="wheezy,jessie,trusty:default,next"
+DESKTOP_TARGET="jessie:default,next"
+KERNEL_TARGET="default,next,dev"
\ No newline at end of file
diff --git a/config/boards/lime2.conf b/config/boards/lime2.conf
index 5dab26e7e8..fedb44a5bd 100644
--- a/config/boards/lime2.conf
+++ b/config/boards/lime2.conf
@@ -1,8 +1,8 @@
 # A20 dual core 1Gb SoC
-KERNEL_TARGET="default,next,dev"
 LINUXFAMILY=sun7i
 BOOTCONFIG=A20-OLinuXino-Lime2_defconfig
 MODULES="hci_uart gpio_sunxi rfcomm hidp bonding spi_sun7i 8021q a20_tp"
 MODULES_NEXT="bonding"
-CLI_TARGET="%,%"
-DESKTOP_TARGET="jessie,%"
+CLI_TARGET="wheezy,jessie,trusty:default,next"
+DESKTOP_TARGET="jessie:default,next"
+KERNEL_TARGET="default,next,dev"
\ No newline at end of file
diff --git a/config/boards/micro.conf b/config/boards/micro.conf
index 1d87e47503..f605e52256 100644
--- a/config/boards/micro.conf
+++ b/config/boards/micro.conf
@@ -1,8 +1,8 @@
 # A20 dual core 1Gb SoC
-KERNEL_TARGET="default,next,dev"
 LINUXFAMILY=sun7i
 BOOTCONFIG=A20-OLinuXino_MICRO_config
 MODULES="hci_uart gpio_sunxi rfcomm hidp bonding spi_sun7i 8021q a20_tp"
 MODULES_NEXT="bonding"
-CLI_TARGET="%,%"
-DESKTOP_TARGET="jessie,%"
+CLI_TARGET="wheezy,jessie,trusty:default,next"
+DESKTOP_TARGET="jessie:default,next"
+KERNEL_TARGET="default,next,dev"
\ No newline at end of file
diff --git a/config/boards/nanopim1.conf b/config/boards/nanopim1.conf
index 106eca34cb..70cab07a22 100644
--- a/config/boards/nanopim1.conf
+++ b/config/boards/nanopim1.conf
@@ -1,5 +1,4 @@
 # H3 quad core 1Gb SoC Wifi
-KERNEL_TARGET="default,dev"
 LINUXFAMILY=sun8i
 BOOTCONFIG=FriendlyARM_NanoPi_M1_defconfig
 MODULES="#gpio_sunxi #w1-sunxi #w1-gpio #w1-therm #ap6211"
@@ -7,5 +6,6 @@ MODULES_NEXT="brcmfmac"
 CPUMIN="240000"
 CPUMAX="1200000"
 GOVERNOR=interactive
-CLI_TARGET="%,%"
-DESKTOP_TARGET="jessie,default"
+CLI_TARGET="jessie:default,dev"
+DESKTOP_TARGET="jessie:default"
+KERNEL_TARGET="default,dev"
\ No newline at end of file
diff --git a/config/boards/new-board.template b/config/boards/new-board.template
index 914e4f5b5b..f6d00f1818 100644
--- a/config/boards/new-board.template
+++ b/config/boards/new-board.template
@@ -45,8 +45,10 @@ BOARD_COMPILER=arm-linux-gnueabihf-
 ## Kernel branches for BUILD_ALL: bitmask (dev next default)
 BUILD_ALL_TARGET=0
 
-## Kernel and OS releases to build desktop images
-DESKTOP_TARGET='trusty,%'
+## Kernel and OS releases to build images in a batch (distroid:branch)
+CLI_TARGET="jessie:default"
+DESKTOP_TARGET="jessie:default"
+KERNEL_TARGET="default"
 
 ## Function to make board-specific adjustments to rootfs
 install_board_specific()
diff --git a/config/boards/odroidc1.conf b/config/boards/odroidc1.conf
index 230657d0b2..c99a79ce40 100644
--- a/config/boards/odroidc1.conf
+++ b/config/boards/odroidc1.conf
@@ -6,5 +6,6 @@ BOOTCONFIG=odroidc_config
 MODULES="bonding"
 MODULES_NEXT=""
 SERIALCON=ttyS0
-CLI_TARGET="jessie,default"
-DESKTOP_TARGET="jessie,default"
+CLI_TARGET="jessie:default"
+DESKTOP_TARGET="jessie:default"
+KERNEL_TARGET="default"
\ No newline at end of file
diff --git a/config/boards/odroidc2.conf b/config/boards/odroidc2.conf
index 588493d90c..04ff26fce5 100644
--- a/config/boards/odroidc2.conf
+++ b/config/boards/odroidc2.conf
@@ -1,5 +1,4 @@
 # S905 C2 quad core
-KERNEL_TARGET="default"
 ARCH=arm64
 LINUXFAMILY=odroidc2
 BOOTSIZE=32
@@ -10,5 +9,6 @@ CPUMIN="500000"
 CPUMAX="2016000"
 GOVERNOR=conservative
 SERIALCON=ttyS0
-CLI_TARGET="jessie,default"
-DESKTOP_TARGET="jessie,default"
+CLI_TARGET="jessie:default"
+DESKTOP_TARGET="jessie:default"
+KERNEL_TARGET="default"
\ No newline at end of file
diff --git a/config/boards/odroidxu4.conf b/config/boards/odroidxu4.conf
index 45758f89af..17623e4ccb 100644
--- a/config/boards/odroidxu4.conf
+++ b/config/boards/odroidxu4.conf
@@ -1,5 +1,4 @@
 # Exynos5422 XU3/XU4 octa core
-KERNEL_TARGET="default"
 LINUXFAMILY=odroidxu4
 BOOTSIZE=16
 OFFSET=2
@@ -7,5 +6,6 @@ BOOTCONFIG=odroid_config
 MODULES="bonding"
 MODULES_NEXT=""
 SERIALCON=ttySAC2
-CLI_TARGET="%,%"
-DESKTOP_TARGET="jessie,default"
+CLI_TARGET="jessie:default"
+DESKTOP_TARGET="jessie:default"
+KERNEL_TARGET="default"
\ No newline at end of file
diff --git a/config/boards/olinux-som-a13.conf b/config/boards/olinux-som-a13.conf
index 85df8adb05..5dea46ad29 100644
--- a/config/boards/olinux-som-a13.conf
+++ b/config/boards/olinux-som-a13.conf
@@ -1,6 +1,8 @@
 # A13 single core 512Mb SoM
-KERNEL_TARGET=""
 LINUXFAMILY=sun5i
 BOOTCONFIG=A13-OLinuXino_defconfig
 MODULES="gpio_sunxi spi_sunxi"
 MODULES_NEXT="bonding"
+CLI_TARGET=""
+DESKTOP_TARGET=""
+KERNEL_TARGET=""
\ No newline at end of file
diff --git a/config/boards/orangepi.conf b/config/boards/orangepi.conf
index ccb3aedc19..f172eb8973 100644
--- a/config/boards/orangepi.conf
+++ b/config/boards/orangepi.conf
@@ -1,8 +1,8 @@
 # A20 dual core 1Gb SoC Wifi USB hub
-KERNEL_TARGET="default,next,dev"
 LINUXFAMILY=sun7i
 BOOTCONFIG=Orangepi_defconfig
 MODULES="hci_uart gpio_sunxi rfcomm hidp sunxi-ir bonding spi_sun7i 8021q a20_tp"
 MODULES_NEXT="bonding"
-CLI_TARGET="%,%"
-DESKTOP_TARGET="jessie,%"
+CLI_TARGET="wheezy,jessie,trusty:default,next"
+DESKTOP_TARGET="jessie:default,next"
+KERNEL_TARGET="default,next,dev"
\ No newline at end of file
diff --git a/config/boards/orangepih3.conf b/config/boards/orangepih3.conf
index b009d986ed..1b0f799ae8 100644
--- a/config/boards/orangepih3.conf
+++ b/config/boards/orangepih3.conf
@@ -1,5 +1,4 @@
 # H3 quad core (Orange Pi PC/One/2/Lite)
-KERNEL_TARGET="default,dev"
 LINUXFAMILY=sun8i
 BOOTCONFIG=orangepi_h3_defconfig
 MODULES="8189es #gpio_sunxi #w1-sunxi #w1-gpio #w1-therm #gc2035"
@@ -7,5 +6,6 @@ MODULES_NEXT=""
 CPUMIN="480000"
 CPUMAX="1296000"
 GOVERNOR=interactive
-CLI_TARGET="%,%"
-DESKTOP_TARGET="jessie,default"
+CLI_TARGET="jessie:default,dev"
+DESKTOP_TARGET="jessie:default"
+KERNEL_TARGET="default,dev"
\ No newline at end of file
diff --git a/config/boards/orangepimini.conf b/config/boards/orangepimini.conf
index d7e1a36a0e..e4566858ca 100644
--- a/config/boards/orangepimini.conf
+++ b/config/boards/orangepimini.conf
@@ -1,8 +1,8 @@
 # A20 dual core 1Gb SoC Wifi
-KERNEL_TARGET=""
 LINUXFAMILY=sun7i
 BOOTCONFIG=Orangepi_mini_defconfig
 MODULES="hci_uart gpio_sunxi rfcomm hidp sunxi-ir bonding spi_sun7i 8021q a20_tp"
 MODULES_NEXT="bonding"
-CLI_TARGET="%,%"
-DESKTOP_TARGET="jessie,%"
+CLI_TARGET=""
+DESKTOP_TARGET=""
+KERNEL_TARGET=""
\ No newline at end of file
diff --git a/config/boards/orangepiplus.conf b/config/boards/orangepiplus.conf
index beae169a1e..f7d150d9a9 100644
--- a/config/boards/orangepiplus.conf
+++ b/config/boards/orangepiplus.conf
@@ -1,5 +1,4 @@
 # H3 quad core (Orange Pi Plus or Plus 2)
-KERNEL_TARGET="default,dev"
 LINUXFAMILY=sun8i
 BOOTCONFIG=orangepi_plus_defconfig
 MODULES="8189es #gpio_sunxi #w1-sunxi #w1-gpio #w1-therm #gc2035"
@@ -7,5 +6,6 @@ MODULES_NEXT=""
 CPUMIN="480000"
 CPUMAX="1296000"
 GOVERNOR=interactive
-CLI_TARGET="%,%"
-DESKTOP_TARGET="jessie,default"
+CLI_TARGET="jessie:default,dev"
+DESKTOP_TARGET="jessie:default"
+KERNEL_TARGET="default,dev"
\ No newline at end of file
diff --git a/config/boards/pcduino3nano.conf b/config/boards/pcduino3nano.conf
index 31862571b5..366b7eb8ce 100644
--- a/config/boards/pcduino3nano.conf
+++ b/config/boards/pcduino3nano.conf
@@ -1,8 +1,8 @@
 # A20 dual core 1Gb SoC
-KERNEL_TARGET="default,next,dev"
 LINUXFAMILY=sun7i
 BOOTCONFIG=Linksprite_pcDuino3_Nano_defconfig
 MODULES="hci_uart gpio_sunxi rfcomm hidp sunxi-ir bonding spi_sun7i"
 MODULES_NEXT="bonding"
-CLI_TARGET="%,%"
-DESKTOP_TARGET="jessie,%"
+CLI_TARGET="wheezy,jessie,trusty:default,next"
+DESKTOP_TARGET="jessie:default,next"
+KERNEL_TARGET="default,next,dev"
\ No newline at end of file
diff --git a/config/boards/toradex.conf b/config/boards/toradex.conf
index b965d4f10b..3eaffb03b8 100644
--- a/config/boards/toradex.conf
+++ b/config/boards/toradex.conf
@@ -1,7 +1,9 @@
 # Toradex colibri i.MX6
-KERNEL_TARGET=""
 LINUXFAMILY=toradex
 BOOTCONFIG=colibri_imx6_defconfig
 MODULES=""
 MODULES_NEXT=""
 SERIALCON=ttymxc0
+CLI_TARGET=""
+DESKTOP_TARGET=""
+KERNEL_TARGET=""
\ No newline at end of file
diff --git a/config/boards/udoo-neo.conf b/config/boards/udoo-neo.conf
index 9f5cd923ff..be158f5d63 100644
--- a/config/boards/udoo-neo.conf
+++ b/config/boards/udoo-neo.conf
@@ -1,9 +1,9 @@
 # Freescale iMx singe core Wifi
-KERNEL_TARGET="default"
 LINUXFAMILY=neo
 BOOTCONFIG=udoo_neo_config
 MODULES="bonding"
 MODULES_NEXT=""
 SERIALCON=ttymxc0
-CLI_TARGET="%,%"
-DESKTOP_TARGET="jessie,default"
+CLI_TARGET="jessie,trusty:default"
+DESKTOP_TARGET=""
+KERNEL_TARGET="default"
\ No newline at end of file
diff --git a/config/boards/udoo.conf b/config/boards/udoo.conf
index dfbe7802d9..804be779c9 100644
--- a/config/boards/udoo.conf
+++ b/config/boards/udoo.conf
@@ -1,9 +1,9 @@
 # Freescale iMx dual/quad core Wifi
-KERNEL_TARGET="default,next"
 LINUXFAMILY=udoo
 BOOTCONFIG=udoo_qdl_config
 MODULES="bonding"
 MODULES_NEXT=""
 SERIALCON=ttymxc1
-CLI_TARGET="%,%"
-DESKTOP_TARGET="jessie,%"
+CLI_TARGET="wheezy,jessie,trusty:default,next"
+DESKTOP_TARGET="jessie:default,next"
+KERNEL_TARGET="default,next"
\ No newline at end of file