diff --git a/kernel/configs/mesa3d-ci_x86_64.config b/kernel/configs/mesa3d-ci_x86_64.config
index 84f2c9c9337ade9a5ed73dc088dc3009a9a9a74e..d39cfed95fe292bb103a830ed1a387152b3e3c54 100644
--- a/kernel/configs/mesa3d-ci_x86_64.config
+++ b/kernel/configs/mesa3d-ci_x86_64.config
@@ -1,6 +1,10 @@
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_DEBUG_KERNEL=y
 
+# Needed for some > 2023 machines
+CONFIG_IRQ_REMAP=y
+CONFIG_X86_X2APIC=y
+
 CONFIG_CRYPTO_ZSTD=y
 CONFIG_TRANSPARENT_HUGEPAGE=y
 CONFIG_ZRAM_MEMORY_TRACKING=y