diff --git a/configs/raspberrypi_common_defconfig b/configs/raspberrypi_common_defconfig
index 155ce24..5abe266 100644
--- a/configs/raspberrypi_common_defconfig
+++ b/configs/raspberrypi_common_defconfig
@@ -1,7 +1,11 @@
 BR2_arm=y
 BR2_arm1176jzf_s=y
-BR2_TOOLCHAIN_EXTERNAL=y
-BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_GLIBC_STABLE=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y
+BR2_BINUTILS_VERSION_2_45_X=y
+BR2_GCC_VERSION_15_X=y
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
+BR2_PACKAGE_HOST_GDB=y
+BR2_GDB_VERSION_16=y
 BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
 BR2_SYSTEM_DHCP="eth0"
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi/post-build.sh"