diff --git a/build_toolchains b/build_toolchains
index c22ed0977f..0b283b1b06 100755
--- a/build_toolchains
+++ b/build_toolchains
@@ -43,12 +43,14 @@ cp "${BUILD_LIBRARY_DIR}/toolchain_util.sh" "${ROOT_OVERLAY}/tmp"
 catalyst_build
 
 def_upload_path="${UPLOAD_ROOT}/sdk/${ARCH}/${FLAGS_version}"
-upload_files "packages" "${def_upload_path}" "pkgs/" "${BINPKGS}/crossdev"/*
+upload_files "cross toolchain packages" "${def_upload_path}" \
+    "toolchain/" "${BINPKGS}/crossdev"/*
 
 for board in $(get_board_list); do
     board_packages="${BINPKGS}/target/${board}"
     def_upload_path="${UPLOAD_ROOT}/${board}/${FLAGS_version}"
-    upload_files packages "${def_upload_path}" "pkgs/" "${board_packages}"/*
+    upload_files "board toolchain packages" "${def_upload_path}" \
+        "toolchain/" "${board_packages}"/*
 done
 
 command_completed