diff --git a/config/boards/bananapim2plus.conf b/config/boards/bananapim2plus.conf
index 734cc4cfaa..bf2a9eac5b 100644
--- a/config/boards/bananapim2plus.conf
+++ b/config/boards/bananapim2plus.conf
@@ -9,8 +9,8 @@ CPUMIN="240000"
 CPUMAX="1200000"
 #
 KERNEL_TARGET="default,next,dev"
-CLI_TARGET="stretch,xenial:next"
-DESKTOP_TARGET="xenial:default,next"
+CLI_TARGET="stretch,bionic:next"
+DESKTOP_TARGET="xenial:default"
 #
-CLI_BETA_TARGET="bionic:next"
+CLI_BETA_TARGET=""
 DESKTOP_BETA_TARGET=""
diff --git a/config/boards/orangepilite.conf b/config/boards/orangepilite.conf
index f14b47b790..ca119af321 100644
--- a/config/boards/orangepilite.conf
+++ b/config/boards/orangepilite.conf
@@ -9,7 +9,7 @@ CPUMIN="408000"
 CPUMAX="1200000"
 #
 KERNEL_TARGET="default,next,dev"
-CLI_TARGET="stretch,xenial:next"
-DESKTOP_TARGET="stretch:next"
+CLI_TARGET="stretch,bionic:next"
+DESKTOP_TARGET="xenial:default"
 #
-CLI_BETA_TARGET="bionic:next"
+CLI_BETA_TARGET=""
diff --git a/config/boards/orangepione.conf b/config/boards/orangepione.conf
index 0866128b1f..7ea637d39c 100644
--- a/config/boards/orangepione.conf
+++ b/config/boards/orangepione.conf
@@ -9,7 +9,7 @@ CPUMIN="408000"
 CPUMAX="1200000"
 #
 KERNEL_TARGET="default,next,dev"
-CLI_TARGET="stretch,xenial:next"
+CLI_TARGET="stretch,bionic:next"
 DESKTOP_TARGET="xenial:default"
 #
-CLI_BETA_TARGET="bionic:next"
+CLI_BETA_TARGET=""
diff --git a/config/boards/orangepizeroplus2-h5.conf b/config/boards/orangepizeroplus2-h5.conf
index e4fc821c77..be607a3e48 100644
--- a/config/boards/orangepizeroplus2-h5.conf
+++ b/config/boards/orangepizeroplus2-h5.conf
@@ -12,6 +12,6 @@ CPUMAX=1200000
 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=""