diff --git a/meta-lmp-base/conf/layer.conf b/meta-lmp-base/conf/layer.conf
index 351fa5fc2..c01cf90ac 100644
--- a/meta-lmp-base/conf/layer.conf
+++ b/meta-lmp-base/conf/layer.conf
@@ -54,3 +54,9 @@ BBFILE_PRIORITY_tpm-layer:append = " 6"
 
 # To use the meta-virt scarthgap branch we need to add kirkstone compatability
 LAYERSERIES_COMPAT_virtualization-layer:append = " kirkstone"
+
+# To use the meta-virt scarthgap branch we need to mask some bbappend
+BBMASK:append = " \
+    /meta-virtualization/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-yocto_6.6.bbappend \
+    /meta-virtualization/dynamic-layers/xilinx/recipes-bsp/u-boot/u-boot-xlnx-scr.bbappend \
+"