diff --git a/buildroot-external/configs/rpi4_64-gui_defconfig b/buildroot-external/configs/rpi4_64-gui_defconfig
index 6a91e9db..00ebb56e 100644
--- a/buildroot-external/configs/rpi4_64-gui_defconfig
+++ b/buildroot-external/configs/rpi4_64-gui_defconfig
@@ -8,7 +8,9 @@ BR2_OPTIMIZE_2=y
 BR2_GLOBAL_PATCH_DIR="../buildroot-patches"
 # BR2_COMPILER_PARANOID_UNSAFE_PATH is not set
 BR2_FORCE_HOST_BUILD=y
+BR2_SSP_REGULAR=y
 BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y
 BR2_PACKAGE_GLIBC_UTILS=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_TOOLCHAIN_BUILDROOT_FORTRAN=y
@@ -31,11 +33,11 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL)/board/raspberrypi4-64/post-image.s
 BR2_ROOTFS_POST_SCRIPT_ARGS="--add-miniuart-bt-overlay --aarch64"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/8f37682fc1fb519610656d8111b161883573e1f8.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/6da087d0c70c256aeeaa230dd52094d709aef61b.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2711"
 BR2_LINUX_KERNEL_LZ4=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-4-b"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-4-b broadcom/bcm2711-rpi-400 broadcom/bcm2711-rpi-cm4"
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
 BR2_PACKAGE_LINUX_TOOLS_GPIO=y
@@ -372,8 +374,6 @@ BR2_PACKAGE_LIBSVG_CAIRO=y
 BR2_PACKAGE_OPENJPEG=y
 BR2_PACKAGE_TIFF=y
 BR2_PACKAGE_WAFFLE=y
-BR2_PACKAGE_DTC=y
-BR2_PACKAGE_DTC_PROGRAMS=y
 BR2_PACKAGE_LIBCEC=y
 BR2_PACKAGE_LIBV4L=y
 BR2_PACKAGE_LIBV4L_UTILS=y
@@ -506,6 +506,7 @@ BR2_PACKAGE_LIBRE=y
 BR2_PACKAGE_LIBREM=y
 BR2_PACKAGE_LOTTIE_QML=y
 BR2_PACKAGE_NCPAMIXER=y
+BR2_PACKAGE_RESPEAKER=y
 BR2_PACKAGE_SNAPCAST=y
 BR2_PACKAGE_SNAPCAST_SERVER=y
 BR2_PACKAGE_SPOTIFYD=y