diff --git a/config/boards/bananapi.conf b/config/boards/bananapi.conf
index d455d68d7e..f7f09885cd 100644
--- a/config/boards/bananapi.conf
+++ b/config/boards/bananapi.conf
@@ -9,8 +9,8 @@ KERNEL_TARGET="default,next,dev"
 CLI_TARGET="jessie,xenial:next"
 DESKTOP_TARGET="xenial:default,next"
 
-CLI_BETA_TARGET=""
-DESKTOP_BETA_TARGET=""
+CLI_BETA_TARGET="stretch:next"
+DESKTOP_BETA_TARGET="stretch:next"
 #
 RECOMMENDED="Ubuntu_xenial_default_desktop:90,Debian_jessie_next:100"
 #
diff --git a/config/boards/bananapipro.conf b/config/boards/bananapipro.conf
index 63e1a880f3..f4a2200aca 100644
--- a/config/boards/bananapipro.conf
+++ b/config/boards/bananapipro.conf
@@ -9,6 +9,9 @@ KERNEL_TARGET="default,next,dev"
 CLI_TARGET="jessie,xenial:next"
 DESKTOP_TARGET="xenial:default,next"
 #
+CLI_BETA_TARGET="stretch:next"
+DESKTOP_BETA_TARGET="stretch:next"
+#
 RECOMMENDED="Ubuntu_xenial_default_desktop:90,Debian_jessie_next:100"
 #
 BOARDRATING=""
diff --git a/config/boards/lime2.conf b/config/boards/lime2.conf
index d4ff2d1c4f..a17e72fa8b 100644
--- a/config/boards/lime2.conf
+++ b/config/boards/lime2.conf
@@ -10,7 +10,7 @@ CLI_TARGET="jessie,xenial:next"
 DESKTOP_TARGET="xenial:default,next"
 
 CLI_BETA_TARGET="stretch:next"
-DESKTOP_BETA_TARGET=""
+DESKTOP_BETA_TARGET="stretch:next"
 #
 RECOMMENDED="Ubuntu_xenial_default_desktop:90,Debian_jessie_next:100"
 #