diff --git a/config/boards/nanopim1.conf b/config/boards/nanopim1.conf
index 806dae353..7b0fdb467 100644
--- a/config/boards/nanopim1.conf
+++ b/config/boards/nanopim1.conf
@@ -9,7 +9,7 @@ CPUMIN="240000"
 CPUMAX="1200000"
 #
 KERNEL_TARGET="default,next,dev"
-CLI_TARGET="jessie,xenial:default"
+CLI_TARGET="stretch:next"
 DESKTOP_TARGET="xenial:default"
 #
 CLI_BETA_TARGET=""
diff --git a/config/boards/nanopim1plus.conf b/config/boards/nanopim1plus.conf
index 4979154a3..50184d315 100644
--- a/config/boards/nanopim1plus.conf
+++ b/config/boards/nanopim1plus.conf
@@ -9,7 +9,7 @@ CPUMIN="240000"
 CPUMAX="1200000"
 #
 KERNEL_TARGET="default,next,dev"
-CLI_TARGET="jessie,xenial:default"
+CLI_TARGET="stretch:next"
 DESKTOP_TARGET="xenial:default"
 #
 CLI_BETA_TARGET=""
diff --git a/config/boards/nanopineoplus2.conf b/config/boards/nanopineoplus2.conf
index c30867048..c6d761dc6 100644
--- a/config/boards/nanopineoplus2.conf
+++ b/config/boards/nanopineoplus2.conf
@@ -12,11 +12,9 @@ CPUMAX="816000"
 BUILD_DESKTOP="no"
 #
 KERNEL_TARGET="next,dev"
-CLI_TARGET=""
-DESKTOP_TARGET=""
+CLI_TARGET="stretch:next"
 #
 CLI_BETA_TARGET="stretch:next"
-DESKTOP_BETA_TARGET=""
 #
 RECOMMENDED="Debian_stretch_next_nightly:60"
 #