diff --git a/board/raspberrypi/extlinux.conf b/board/raspberrypi/extlinux.conf
index 2865429..b51e6e8 100644
--- a/board/raspberrypi/extlinux.conf
+++ b/board/raspberrypi/extlinux.conf
@@ -1,4 +1,4 @@
 label buildroot
 	kernel /zImage
-	devicetree /bcm2708-rpi-b-plus.dtb
+	devicetree /bcm2835-rpi-b-plus.dtb
 	append root=/dev/mmcblk0p2 rootwait console=tty1 console=ttyAMA0,115200
diff --git a/configs/raspberrypi_common_defconfig b/configs/raspberrypi_common_defconfig
index 5aca594..155ce24 100644
--- a/configs/raspberrypi_common_defconfig
+++ b/configs/raspberrypi_common_defconfig
@@ -2,17 +2,16 @@ BR2_arm=y
 BR2_arm1176jzf_s=y
 BR2_TOOLCHAIN_EXTERNAL=y
 BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_GLIBC_STABLE=y
-BR2_GLOBAL_PATCH_DIR="board/raspberrypi/patches"
 BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
 BR2_SYSTEM_DHCP="eth0"
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi/post-build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_RPI_COMMON_PATH)/board/raspberrypi/post-image.sh"
 BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,21b410140c47ffab5668399f6f143c7d7b935c8b)/linux-21b410140c47ffab5668399f6f143c7d7b935c8b.tar.gz"
-BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.74"
+BR2_LINUX_KERNEL_DEFCONFIG="bcm2835"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2835-rpi-b-plus broadcom/bcm2708-rpi-b-plus"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2835-rpi-b-plus"
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
 BR2_PACKAGE_XZ=y