diff --git a/conf/machine/include/rpi-default-versions.inc b/conf/machine/include/rpi-default-versions.inc
index 8e3e9be6..e274880d 100644
--- a/conf/machine/include/rpi-default-versions.inc
+++ b/conf/machine/include/rpi-default-versions.inc
@@ -1,4 +1,5 @@
 # RaspberryPi BSP default versions
 
-PREFERRED_VERSION_linux-raspberrypi ??= "6.12.%"
-PREFERRED_VERSION_linux-raspberrypi-v7 ??= "${PREFERRED_VERSION_linux-raspberrypi}"
+PREFERRED_VERSION_linux-raspberrypi ??= "6.18.%"
+PREFERRED_VERSION_linux-raspberrypi:raspberrypi-armv7 ??= "6.12.%"
+PREFERRED_VERSION_linux-raspberrypi-v7 ??= "6.12.%"
diff --git a/conf/machine/raspberrypi4.conf b/conf/machine/raspberrypi4.conf
index 86c57ed4..9876b598 100644
--- a/conf/machine/raspberrypi4.conf
+++ b/conf/machine/raspberrypi4.conf
@@ -6,6 +6,12 @@ DEFAULTTUNE ?= "cortexa7thf-neon-vfpv4"
 require conf/machine/include/arm/armv7a/tune-cortexa7.inc
 include conf/machine/include/rpi-base.inc
 
+# 6.18 has removed 32bit config for rpi4 and expects it
+# to always use 64bit kernel even if rootfs is needed to be
+# 32bit. So we need multiconfig builds, and technically, 32bit
+# option for rpi4 should be gone
+PREFERRED_VERSION_linux-raspberrypi ?= "6.12.%"
+
 MACHINE_FEATURES += "pci"
 MACHINE_EXTRA_RRECOMMENDS += "\
     linux-firmware-rpidistro-bcm43455 \