diff --git a/config/boards/lime-a64.wip b/config/boards/lime-a64.wip
index 4490e61932..05ad1adc11 100644
--- a/config/boards/lime-a64.wip
+++ b/config/boards/lime-a64.wip
@@ -13,12 +13,5 @@ KERNEL_TARGET="default,next,dev"
 CLI_TARGET=""
 DESKTOP_TARGET=""
 #
-CLI_BETA_TARGET="xenial,stretch:next"
-DESKTOP_BETA_TARGET="xenial:default"
-#
-RECOMMENDED="Ubuntu_xenial_default_desktop_nightly:80,Debian_stretch_next_nightly:80"
-#
-BOARDRATING=""
-CHIP="https://docs.armbian.com/Hardware_Allwinner-H5-A64/"
-HARDWARE="https://linux-sunxi.org/Olimex_A64-OLinuXino"
-FORUMS="https://forum.armbian.com/index.php/forum/11-other-boards/"
+CLI_BETA_TARGET=""
+DESKTOP_BETA_TARGET=""
diff --git a/config/boards/nanopim1plus.conf b/config/boards/nanopim1plus.conf
index fbd2163fb0..c7c3c6e066 100644
--- a/config/boards/nanopim1plus.conf
+++ b/config/boards/nanopim1plus.conf
@@ -12,4 +12,4 @@ KERNEL_TARGET="default,next,dev"
 CLI_TARGET="stretch:next"
 DESKTOP_TARGET="xenial:default"
 #
-CLI_BETA_TARGET="bionic:next"
+CLI_BETA_TARGET=""
diff --git a/config/boards/nanopineo2.conf b/config/boards/nanopineo2.conf
index 2fa920b8db..662c18e8ed 100644
--- a/config/boards/nanopineo2.conf
+++ b/config/boards/nanopineo2.conf
@@ -12,6 +12,6 @@ CPUMAX="816000"
 BUILD_DESKTOP="no"
 #
 KERNEL_TARGET="next,dev"
-CLI_TARGET="stretch,xenial:next"
+CLI_TARGET="stretch,bionic:next"
 #
-CLI_BETA_TARGET="bionic:next"
+CLI_BETA_TARGET=""
diff --git a/config/boards/pine64.conf b/config/boards/pine64.conf
index 8868b36483..650199b06c 100644
--- a/config/boards/pine64.conf
+++ b/config/boards/pine64.conf
@@ -8,8 +8,8 @@ MODULES="sunxi_codec sunxi_i2s sunxi_sndcodec 8723bs"
 MODULES_NEXT=""
 #
 KERNEL_TARGET="default,next,dev"
-CLI_TARGET="jessie,xenial:default"
+CLI_TARGET="xenial:default"
 DESKTOP_TARGET="xenial:default"
 #
-CLI_BETA_TARGET="bionic:next"
+CLI_BETA_TARGET=""
 DESKTOP_BETA_TARGET=""
diff --git a/config/boards/pine64so.conf b/config/boards/pine64so.conf
index b2f4fc912f..67fb930c79 100644
--- a/config/boards/pine64so.conf
+++ b/config/boards/pine64so.conf
@@ -10,6 +10,6 @@ MODULES_NEXT=""
 KERNEL_TARGET="default,next,dev"
 CLI_TARGET="xenial:default"
 DESKTOP_TARGET=""
-
-CLI_BETA_TARGET="bionic:next"
+#
+CLI_BETA_TARGET=""
 DESKTOP_BETA_TARGET=""
diff --git a/config/boards/tinkerboard.conf b/config/boards/tinkerboard.conf
index a213df4107..06aa606fd9 100644
--- a/config/boards/tinkerboard.conf
+++ b/config/boards/tinkerboard.conf
@@ -8,7 +8,7 @@ MODULES_NEXT=""
 #
 KERNEL_TARGET="default,next,dev"
 CLI_TARGET="stretch:default,next"
-DESKTOP_TARGET="xenial:default,next"
+DESKTOP_TARGET="bionic:default,next"
 #
-CLI_BETA_TARGET="bionic:next"
+CLI_BETA_TARGET=""
 DESKTOP_BETA_TARGET=""
diff --git a/config/boards/tritium-h3.csc b/config/boards/tritium-h3.csc
index 3afc95c068..f077a151f0 100644
--- a/config/boards/tritium-h3.csc
+++ b/config/boards/tritium-h3.csc
@@ -10,15 +10,5 @@ CPUMIN="240000"
 CPUMAX="912000"
 #
 KERNEL_TARGET="next"
-CLI_TARGET=""
-
-CLI_BETA_TARGET=""
-#
-RECOMMENDED="Ubuntu_xenial_next_nightly:75"
-#
-BOARDRATING=""
-CHIP="http://docs.armbian.com/Hardware_Allwinner-H3/"
-HARDWARE="https://libre.computer/products/boards/all-h3-cc/"
-FORUMS="http://forum.armbian.com/index.php/forum/13-allwinner-h3/"
-MISC3="<a href=http://forum.armbian.com/index.php/topic/1614-running-h3-boards-with-minimal-consumption/>Minimize consumption</a>"
-BUY=""
+CLI_TARGET="bionic,stretch:next"
+DESKTOP_TARGET=""
diff --git a/config/boards/tritium-h5.csc b/config/boards/tritium-h5.csc
index 9ba0bd6d2b..2649b6b49a 100644
--- a/config/boards/tritium-h5.csc
+++ b/config/boards/tritium-h5.csc
@@ -10,19 +10,8 @@ CPUMIN="240000"
 CPUMAX="1200000"
 #
 KERNEL_TARGET="next"
-CLI_TARGET=""
-#
+CLI_TARGET="bionic,stretch:next"
 CLI_BETA_TARGET=""
 #
-DESKTOP_TARGET=""
-#
-DESKTOP_BETA_TARGET="xenial:next"
-#
-RECOMMENDED="Ubuntu_xenial_next_nightly:75"
-#
-BOARDRATING=""
-CHIP="http://docs.armbian.com/Hardware_Allwinner-H3/"
-HARDWARE="https://libre.computer/products/boards/all-h3-cc/"
-FORUMS="http://forum.armbian.com/index.php/forum/13-allwinner-h3/"
-MISC3="<a href=http://forum.armbian.com/index.php/topic/1614-running-h3-boards-with-minimal-consumption/>Minimize consumption</a>"
-BUY=""
+DESKTOP_TARGET="bionic:next"
+DESKTOP_BETA_TARGET=""