diff --git a/config/boards/beelinkx2.conf b/config/boards/beelinkx2.conf
index 2ce0e2b5a..7d59e7735 100644
--- a/config/boards/beelinkx2.conf
+++ b/config/boards/beelinkx2.conf
@@ -5,16 +5,17 @@ BOOTCONFIG="orangepi_pc_plus_defconfig"
 #
 MODULES="sndspdif sunxi_sndspdif sunxi_spdif sunxi_spdma sunxi-cir"
 MODULES_NEXT=""
+DEFAULT_OVERLAYS="spdif-out cir"
 CPUMIN="240000"
 CPUMAX="1200000"
 #
-KERNEL_TARGET="default,dev"
+KERNEL_TARGET="default,next,dev"
 CLI_TARGET="jessie,xenial:default"
 DESKTOP_TARGET="xenial:default"
 
-DESKTOP_BETA_TARGET=""
+DESKTOP_BETA_TARGET="stretch:next"
 #
-RECOMMENDED="Ubuntu_xenial_default:90,Ubuntu_xenial_default_desktop:90"
+RECOMMENDED="Ubuntu_xenial_default_desktop:90,Debian_stretch_next_nightly:60"
 #
 BOARDRATING=""
 HARDWARE="https://linux-sunxi.org/Beelink_X2"