diff --git a/conf/machine/include/rpi-default-versions.inc b/conf/machine/include/rpi-default-versions.inc
index 8e3e9be..e274880 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.%"