diff --git a/bootstrap_sdk b/bootstrap_sdk
index f14ade3efe..4a551b2bca 100755
--- a/bootstrap_sdk
+++ b/bootstrap_sdk
@@ -47,7 +47,7 @@ catalyst_stage4() {
 cat <<EOF
 target: stage4
 pkgcache_path: $BINPKGS
-stage4/packages: dev-python/setuptools dev-vcs/git app-arch/pbzip2 net-misc/curl app-admin/sudo app-shells/bash-completion sys-devel/crossdev coreos-base/hard-host-depends
+stage4/packages: coreos-devel/sdk-depends
 stage4/fsscript: ${SCRIPT_ROOT}/lib/catalyst_sdk_stage4.sh
 stage4/root_overlay: ${TEMPDIR}/stage4_overlay
 EOF
diff --git a/setup_board b/setup_board
index cd272e0bb6..68d95ae2b4 100755
--- a/setup_board
+++ b/setup_board
@@ -342,7 +342,7 @@ if ${HOST_BOARD}; then
   if [[ $FLAGS_fast -eq $FLAGS_TRUE ]]; then
     EMERGE_CMD="${GCLIENT_ROOT}/chromite/bin/parallel_emerge"
   fi
-  PACKAGES="system hard-host-depends world"
+  PACKAGES="system coreos-devel/sdk-depends world"
 
   # First, rebuild all packages from scratch. This is needed to make sure
   # we rebuild all chroot packages.
diff --git a/update_chroot b/update_chroot
index 4f5fc84985..826cb6f584 100755
--- a/update_chroot
+++ b/update_chroot
@@ -105,7 +105,7 @@ if [[ "${FLAGS_jobs}" -ne -1 ]]; then
   EMERGE_FLAGS+=" --jobs=${FLAGS_jobs}"
 fi
 
-# Perform an update of hard-host-depends and world in the chroot.
+# Perform an update of coreos-devel/sdk-depends and world in the chroot.
 EMERGE_CMD="emerge"
 CHROMITE_BIN="${GCLIENT_ROOT}/chromite/bin"
 if [ "${FLAGS_fast}" -eq "${FLAGS_TRUE}" ]; then
@@ -137,7 +137,7 @@ done
 # Second pass, update everything else.
 EMERGE_FLAGS+=" --deep"
 sudo -E ${EMERGE_CMD} ${EMERGE_FLAGS} \
-    coreos-base/hard-host-depends world
+    coreos-devel/sdk-depends world
 
 # Automatically discard all CONFIG_PROTECT'ed files. Those that are
 # protected should not be overwritten until the variable is changed.