diff --git a/build_library/catalyst.sh b/build_library/catalyst.sh
index b2f25fb0e5..9fe8e692ad 100644
--- a/build_library/catalyst.sh
+++ b/build_library/catalyst.sh
@@ -5,14 +5,15 @@
 
 # common.sh should be sourced first
 [[ -n "${DEFAULT_BUILD_ROOT}" ]] || exit 1
-. "${SCRIPTS_DIR}/sdk_lib/sdk_util.sh"
+. "${SCRIPTS_DIR}/sdk_lib/sdk_util.sh" || exit 1
+. "${BUILD_LIBRARY_DIR}/toolchain_util.sh" || exit 1
 
 # Default option values, may be provided before including this file
 : ${TYPE:="coreos-sdk"}
-: ${ARCH:=$(portageq envvar ARCH)}
+: ${ARCH:=$(get_sdk_arch)}
 : ${DEFAULT_CATALYST_ROOT:="${DEFAULT_BUILD_ROOT}/catalyst"}
 : ${DEFAULT_SEED:=${COREOS_SDK_TARBALL_PATH}}
-: ${DEFAULT_PROFILE:="coreos:default/linux/${ARCH}/10.0"}
+: ${DEFAULT_PROFILE:=$(get_sdk_profile)}
 # Set to something like "stage4" to restrict what to build
 # FORCE_STAGES=
 
diff --git a/build_toolchains b/build_toolchains
index c61c6b4bda..190cf3ddaa 100755
--- a/build_toolchains
+++ b/build_toolchains
@@ -11,7 +11,6 @@ TYPE="coreos-toolchains"
 FORCE_STAGES="stage4"
 
 . "${BUILD_LIBRARY_DIR}/catalyst.sh" || exit 1
-. "${BUILD_LIBRARY_DIR}/toolchain_util.sh" || exit 1
 
 # include upload options
 . "${BUILD_LIBRARY_DIR}/release_util.sh" || exit 1