diff --git a/config/boards/cubietruck.conf b/config/boards/cubietruck.conf
index 54b0fd333..12470f548 100644
--- a/config/boards/cubietruck.conf
+++ b/config/boards/cubietruck.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/orangepipcplus.conf b/config/boards/orangepipcplus.conf
index 6b326186e..5f1006cd3 100644
--- a/config/boards/orangepipcplus.conf
+++ b/config/boards/orangepipcplus.conf
@@ -11,8 +11,8 @@ KERNEL_TARGET="default,next,dev"
 CLI_TARGET="jessie,xenial:default"
 DESKTOP_TARGET="xenial:default"
 
-CLI_BETA_TARGET=""
-DESKTOP_BETA_TARGET=""
+CLI_BETA_TARGET="stretch:next"
+DESKTOP_BETA_TARGET="stretch:next"
 #
 RECOMMENDED="Ubuntu_xenial_default:90,Ubuntu_xenial_default_desktop:90"
 #
diff --git a/config/boards/pine64.conf b/config/boards/pine64.conf
index 382adfb06..e86a66382 100644
--- a/config/boards/pine64.conf
+++ b/config/boards/pine64.conf
@@ -12,7 +12,7 @@ CLI_TARGET="jessie,xenial:default"
 DESKTOP_TARGET="xenial:default"
 
 CLI_BETA_TARGET=""
-DESKTOP_BETA_TARGET=""
+DESKTOP_BETA_TARGET="stretch:default"
 #
 RECOMMENDED="Ubuntu_xenial_default_desktop:90,Ubuntu_xenial_dev_nightly:33"
 #