diff --git a/ci/build-all-defconfigs.sh b/ci/build-all-defconfigs.sh
index c9bb98b..955120c 100755
--- a/ci/build-all-defconfigs.sh
+++ b/ci/build-all-defconfigs.sh
@@ -108,8 +108,12 @@
 	# Enable toolchains we'll need to be built as part of the SDK, and make sure we
 	# consider them to make the sdk unique
 	buildroot/utils/config --file $SDK_BUILD_DIR/.config --package \
-		--enable P8_PORE_TOOLCHAIN  --enable HOST_P8_PORE_BINUTILS
+		--enable P8_PORE_TOOLCHAIN  --enable HOST_P8_PORE_BINUTILS \
+		--enable PPE42_TOOLCHAIN --enable HOST_PPE42_GCC --enable HOST_PPE42_BINUTILS
+
 	HASH_PROPERTIES="$HASH_PROPERTIES $(sha1sum_dir openpower/package/p8-pore-binutils/)"
+	HASH_PROPERTIES="$HASH_PROPERTIES $(sha1sum_dir openpower/package/ppe42-gcc/)"
+	HASH_PROPERTIES="$HASH_PROPERTIES $(sha1sum_dir openpower/package/ppe42-binutils/)"
 
 	# As we are disabling BR2_LINUX_KERNEL, capture Kernel version if any
 	# to prevent it from defaulting to the last on olddefconfig
@@ -269,6 +273,14 @@
 			--set-str P8_PORE_TOOLCHAIN_EXTERNAL_PATH $SDK_DIR/host
 	fi
 
+	# Our SDK will always have ppe42-toolchain enabled, but
+	# only use it if we require it
+	PPE42_REQUIRED=$(buildroot/utils/config --file $O/.config --package --state PPE42_TOOLCHAIN)
+	if [ "$PPE42_REQUIRED" = "y" ]; then
+		buildroot/utils/config --file $O/.config --enable PACKAGE_PPE42_TOOLCHAIN_EXTERNAL \
+			--set-str PPE42_TOOLCHAIN_EXTERNAL_PATH $SDK_DIR/host
+	fi
+
 
 
 	# The Kernel Headers requested MUST be the same as the one