diff --git a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/conf/machine/n1sdp-extra-settings.inc b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/conf/machine/n1sdp-extra-settings.inc
index f39e2ea3..3612b2e5 100644
--- a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/conf/machine/n1sdp-extra-settings.inc
+++ b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/conf/machine/n1sdp-extra-settings.inc
@@ -50,8 +50,11 @@ IMAGE_EFI_BOOT_FILES += "xen-n1sdp.efi;xen.efi"
 IMAGE_EFI_BOOT_FILES += "${XEN_MOD_DEVICETREE_DTBS}"
 
 # Use 5.4 kernel until later versions have been validated for autonomy-host
-PREFERRED_PROVIDER_virtual/kernel = "linux-linaro-arm"
-PREFERRED_VERSION_linux-linaro-arm = "5.4%"
+python() {
+    if d.getVar('PREFERRED_PROVIDER_virtual/kernel') == 'linux-yocto':
+        d.setVar('PREFERRED_PROVIDER_virtual/kernel', 'linux-linaro-arm')
+        d.setVar('PREFERRED_VERSION_linux-linaro-arm', '5.4%')
+}
 
 # When alternate-kernel DISTRO_FEATURE is present we set the linux-linaro-arm-rt
 # by default