diff --git a/meta-arm-bsp/conf/machine/fvp-base.conf b/meta-arm-bsp/conf/machine/fvp-base.conf
index 353024e2..2fc49fc7 100644
--- a/meta-arm-bsp/conf/machine/fvp-base.conf
+++ b/meta-arm-bsp/conf/machine/fvp-base.conf
@@ -23,6 +23,8 @@ PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
 KERNEL_DTB_NAME = "fvp-base-revc.dtb"
 KERNEL_DEVICETREE = "arm/${KERNEL_DTB_NAME}"
 KERNEL_IMAGETYPE = "Image"
+#FIXME - Working around arm-tstee not compiling on kernels greater than 6.8
+PREFERRED_VERSION_linux-yocto ?= "6.6.%"
 
 EXTRA_IMAGEDEPENDS += "trusted-firmware-a"
 
diff --git a/meta-arm/conf/machine/qemuarm64-secureboot.conf b/meta-arm/conf/machine/qemuarm64-secureboot.conf
index 78a39c03..cfc6ff77 100644
--- a/meta-arm/conf/machine/qemuarm64-secureboot.conf
+++ b/meta-arm/conf/machine/qemuarm64-secureboot.conf
@@ -3,6 +3,9 @@ MACHINEOVERRIDES =. "qemuarm64:"
 require ${COREBASE}/meta/conf/machine/qemuarm64.conf
 
 KMACHINE = "qemuarm64"
+#FIXME - Working around arm-tstee not compiling on kernels greater than 6.8
+PREFERRED_VERSION_linux-yocto ?= "6.6.%"
+PREFERRED_VERSION_linux-yocto-rt ?= "6.6.%"
 
 # secure=on can't ever use KVM, so force it off
 QEMU_USE_KVM = ""