diff --git a/ci/base.yml b/ci/base.yml
index 87192fba..8e72310f 100644
--- a/ci/base.yml
+++ b/ci/base.yml
@@ -43,6 +43,10 @@ local_conf_header:
   extrapackages: |
     CORE_IMAGE_EXTRA_INSTALL += "perf"
     CORE_IMAGE_EXTRA_INSTALL:append:aarch64 = " gator-daemon"
+  fix-xen: |
+    # Temporary workaround until linux-yocto 6.18.3 is merged
+    SRCREV_meta:pn-linux-yocto:qemuarm = "83fff3acfc84814b4da0cdb2a63d608d376c3cdd"
+    SRCREV_meta:pn-linux-yocto:qemuarm64 = "83fff3acfc84814b4da0cdb2a63d608d376c3cdd"
 
 machine: unset