diff --git a/config/boards/bananapim64.csc b/config/boards/bananapim64.csc
new file mode 100644
index 0000000000..0c6e60aca2
--- /dev/null
+++ b/config/boards/bananapim64.csc
@@ -0,0 +1,23 @@
+# A64 quad core 2GB SoC GBE WiFi eMMC
+BOARD_NAME="Banana Pi M64"
+LINUXFAMILY="sun50iw1"
+BOOTCONFIG="bananapi_m64_defconfig"
+#
+MODULES=""
+MODULES_NEXT=""
+CPUMIN="480000"
+CPUMAX="1296000"
+#
+KERNEL_TARGET="next,dev"
+CLI_TARGET=""
+DESKTOP_TARGET=""
+
+CLI_BETA_TARGET=""
+DESKTOP_BETA_TARGET=""
+#
+RECOMMENDED="Ubuntu_xenial_dev_nightly:33"
+#
+BOARDRATING=""
+CHIP="https://docs.armbian.com/Hardware_Allwinner-H5-A64/"
+HARDWARE="https://linux-sunxi.org/Sinovoip_Banana_Pi_M64"
+FORUMS="https://forum.armbian.com/index.php/forum/11-other-boards/"
\ No newline at end of file
diff --git a/config/boards/espressobin.wip b/config/boards/espressobin.wip
index a79cc29d0d..9740500d7a 100644
--- a/config/boards/espressobin.wip
+++ b/config/boards/espressobin.wip
@@ -9,7 +9,10 @@ BUILD_DESKTOP="no"
 KERNEL_TARGET="default,next,dev"
 CLI_TARGET="jessie,xenial:default,dev"
 #
-RECOMMENDED="Ubuntu_xenial_default_nightly:60"
+CLI_BETA_TARGET="xenial:default,stretch:default"
+DESKTOP_BETA_TARGET=""
+#
+RECOMMENDED="Ubuntu_xenial_default_nightly:75,Debian_stretch_default_nightly:75"
 #
 BOARDRATING=""
 CHIP="http://docs.armbian.com/Hardware_Other/#marvel-armada-espressobin"