diff --git a/conf/distro/angstrom-next.conf b/conf/distro/angstrom-next.conf
index f787fad..953eae7 100644
--- a/conf/distro/angstrom-next.conf
+++ b/conf/distro/angstrom-next.conf
@@ -64,13 +64,17 @@ ANGSTROM_GDB_VERSION                             ?= "7.7%"
 ANGSTROM_NATIVE_BINUTILS_VERSION                 ?= "2.24%"
 #use Linaro tools for ARM
 ANGSTROM_GCC_VERSION_arm                         ?= "linaro-4.9%"
+ANGSTROM_GCC_VERSION_aarch64                     ?= "linaro-4.9%"
 # we use OE-Core for native and nativesdk GCC
 SDKGCCVERSION_arm                                ?= "4.9%"
-ANGSTROM_BINUTILS_VERSION_arm                    ?= "linaro-2.24%"
-ANGSTROM_GDB_VERSION_arm                         ?= "linaro-7.7%"
+ANGSTROM_BINUTILS_VERSION_arm                    ?= "linaro-%"
+ANGSTROM_BINUTILS_VERSION_aarch64                ?= "linaro-%"
+ANGSTROM_GDB_VERSION_arm                         ?= "linaro-%"
+ANGSTROM_GDB_VERSION_aarch64                     ?= "linaro-%"
 PREFERRED_VERSION_eglibc_arm                     ?= "linaro-2.19%"
+PREFERRED_VERSION_eglibc_aarch64                 ?= "linaro-2.19%"
 
-ANGSTROM_QEMU_VERSION                            ?= "2.0%"
+ANGSTROM_QEMU_VERSION                            ?= "2%"
 
 GCCVERSION                                       = "${ANGSTROM_GCC_VERSION}"
 BINUVERSION                                      = "${ANGSTROM_BINUTILS_VERSION}"