diff --git a/README.fuchsia.md b/README.fuchsia.md
index 9a43a3f..7e793d3 100644
--- a/README.fuchsia.md
+++ b/README.fuchsia.md
@@ -16,10 +16,10 @@
 may also be able to find prebuilt toolchain binaries online.
 
 * gcc-linaro-7.3.1-2018.05
-  * Source: https://chrome-infra-packages.appspot.com/p/fuchsia/third_party/source/gcc/linaro/+/s22wCmJRQmXnMGeJQl9NmRzO0n5CAbm3rvRBZNgrai0C
-  * target architecture: `i686_aarch64-elf`
+  * Source: https://chrome-infra-packages.appspot.com/p/fuchsia/third_party/source/gcc/linaro/+/version:7.3-2018.05
+  * target architecture: `aarch64-none-elf`
 * gcc-arm-none-eabi-6-2017-q2-update
-  * Source: https://chrome-infra-packages.appspot.com/p/fuchsia/third_party/source/gcc/arm/arm-none-eabi/+/Pg0Ayh3y2Xx538OvmLcmmUon5YDxvk-EjDYVR0JPUSMC
+  * Source: https://chrome-infra-packages.appspot.com/p/fuchsia/third_party/source/gcc/arm/arm-none-eabi/+/version:6-2017-q2-update
   * target architecture: `arm-none-eabi`
 
 Once you have the toolchain binaries, place them in an adjacent directory
@@ -33,7 +33,7 @@
         * `bin/`
         * `lib/`
         * etc.
-      * `gcc-linaro-7.3.1-2018.05-i686_aarch64-elf/`
+      * `gcc-linaro-7.3.1-2018.05-x86_64_aarch64-elf/`
         * `bin/`
         * `lib/`
         * etc.
diff --git a/fip/build_bl33.sh b/fip/build_bl33.sh
index c542b23..2e4298b 100755
--- a/fip/build_bl33.sh
+++ b/fip/build_bl33.sh
@@ -3,8 +3,7 @@
 LOCAL_PATH="$(readlink -f $(dirname ${BASH_SOURCE[0]})/)"
 
 
-readonly cross_compile=${LOCAL_PATH}/../../sdk/linaro/gcc-linaro-7.3.1-2018.05-i686_aarch64-elf/bin/aarch64-elf-
-#readonly cross_compile=${LOCAL_PATH}/../../amlogic/linaro/gcc-linaro-aarch64-none-elf-4.8-2013.11_linux/bin/aarch64-none-elf-
+readonly cross_compile=${LOCAL_PATH}/../../sdk/linaro/gcc-linaro-7.3.1-2018.05-x86_64_aarch64-elf/bin/aarch64-elf-
 readonly cross_compile_t32=${LOCAL_PATH}/../../sdk/linaro/gcc-arm-none-eabi-6-2017-q2-update/bin/arm-none-eabi-
 
 function pre_build_uboot() {