diff --git a/meta-arm-autonomy/recipes-kernel/linux/arm-autonomy-kmeta/features/arm-autonomy/xen-common.cfg b/meta-arm-autonomy/recipes-kernel/linux/arm-autonomy-kmeta/features/arm-autonomy/xen-common.cfg
new file mode 100644
index 00000000..1e614033
--- /dev/null
+++ b/meta-arm-autonomy/recipes-kernel/linux/arm-autonomy-kmeta/features/arm-autonomy/xen-common.cfg
@@ -0,0 +1,31 @@
+CONFIG_PARAVIRT=y
+CONFIG_XEN=y
+
+CONFIG_BLOCK=y
+
+CONFIG_SCSI=y
+
+CONFIG_NET=y
+
+CONFIG_HVC_IRQ=y
+
+CONFIG_HVC_XEN=y
+
+CONFIG_WATCHDOG=y
+CONFIG_XEN_WDT=y
+
+CONFIG_XEN_BALLOON=y
+
+CONFIG_XEN_DEV_EVTCHN=y
+
+CONFIG_XENFS=y
+CONFIG_XEN_COMPAT_XENFS=y
+
+CONFIG_XEN_SYS_HYPERVISOR=y
+
+CONFIG_XEN_GNTDEV=y
+CONFIG_XEN_GRANT_DEV_ALLOC=y
+CONFIG_SWIOTLB_XEN=y
+
+CONFIG_XEN_EFI=y
+CONFIG_XEN_AUTO_XLATE=y
diff --git a/meta-arm-autonomy/recipes-kernel/linux/arm-autonomy-kmeta/features/arm-autonomy/xen-common.scc b/meta-arm-autonomy/recipes-kernel/linux/arm-autonomy-kmeta/features/arm-autonomy/xen-common.scc
new file mode 100644
index 00000000..beee091b
--- /dev/null
+++ b/meta-arm-autonomy/recipes-kernel/linux/arm-autonomy-kmeta/features/arm-autonomy/xen-common.scc
@@ -0,0 +1,5 @@
+define KFEATURE_DESCRIPTION "Common XEN (Host and Guest) configs and patches on autonomy systems"
+
+kconf non-hardware xen-common.cfg
+
+patch 0001-xen-arm-do-not-setup-the-runstate-info-page-if-kpti-.patch
diff --git a/meta-arm-autonomy/recipes-kernel/linux/arm-autonomy-kmeta/features/arm-autonomy/xen-guest.cfg b/meta-arm-autonomy/recipes-kernel/linux/arm-autonomy-kmeta/features/arm-autonomy/xen-guest.cfg
index e4e44a9c..bb2cbd53 100644
--- a/meta-arm-autonomy/recipes-kernel/linux/arm-autonomy-kmeta/features/arm-autonomy/xen-guest.cfg
+++ b/meta-arm-autonomy/recipes-kernel/linux/arm-autonomy-kmeta/features/arm-autonomy/xen-guest.cfg
@@ -1,27 +1,15 @@
-CONFIG_PARAVIRT=y
-CONFIG_XEN=y
-
-CONFIG_BLOCK=y
 CONFIG_XEN_BLKDEV_FRONTEND=y
 
-CONFIG_SCSI=y
 CONFIG_XEN_SCSI_FRONTEND=y
 
-CONFIG_NET=y
 CONFIG_XEN_NETDEV_FRONTEND=y
 
 CONFIG_INPUT=y
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y
 
-CONFIG_HVC_IRQ=y
-
-CONFIG_HVC_XEN=y
 CONFIG_HVC_XEN_FRONTEND=y
 
-CONFIG_WATCHDOG=y
-CONFIG_XEN_WDT=y
-
 CONFIG_FB_SYS_FILLRECT=y
 CONFIG_FB_SYS_COPYAREA=y
 CONFIG_FB_SYS_IMAGEBLIT=y
@@ -29,21 +17,7 @@ CONFIG_FB_SYS_FOPS=y
 CONFIG_FB_DEFERRED_IO=y
 CONFIG_XEN_FBDEV_FRONTEND=y
 
-CONFIG_XEN_BALLOON=y
-
-CONFIG_XEN_DEV_EVTCHN=y
-
-CONFIG_XENFS=y
-CONFIG_XEN_COMPAT_XENFS=y
-
-CONFIG_XEN_SYS_HYPERVISOR=y
 CONFIG_XEN_XENBUS_FRONTEND=y
-CONFIG_XEN_GNTDEV=y
-CONFIG_XEN_GRANT_DEV_ALLOC=y
-CONFIG_SWIOTLB_XEN=y
-
-CONFIG_XEN_EFI=y
-CONFIG_XEN_AUTO_XLATE=y
 
 CONFIG_DRM=y
 CONFIG_DRM_XEN=y
diff --git a/meta-arm-autonomy/recipes-kernel/linux/arm-autonomy-kmeta/features/arm-autonomy/xen-guest.scc b/meta-arm-autonomy/recipes-kernel/linux/arm-autonomy-kmeta/features/arm-autonomy/xen-guest.scc
index b6811777..17ded00d 100644
--- a/meta-arm-autonomy/recipes-kernel/linux/arm-autonomy-kmeta/features/arm-autonomy/xen-guest.scc
+++ b/meta-arm-autonomy/recipes-kernel/linux/arm-autonomy-kmeta/features/arm-autonomy/xen-guest.scc
@@ -1,5 +1,3 @@
 define KFEATURE_DESCRIPTION "Enable XEN Guest Frontend Drivers"
 
 kconf non-hardware xen-guest.cfg
-
-patch 0001-xen-arm-do-not-setup-the-runstate-info-page-if-kpti-.patch
diff --git a/meta-arm-autonomy/recipes-kernel/linux/arm-autonomy-kmeta/features/arm-autonomy/xen-host.cfg b/meta-arm-autonomy/recipes-kernel/linux/arm-autonomy-kmeta/features/arm-autonomy/xen-host.cfg
index d457cb84..54bd605c 100644
--- a/meta-arm-autonomy/recipes-kernel/linux/arm-autonomy-kmeta/features/arm-autonomy/xen-host.cfg
+++ b/meta-arm-autonomy/recipes-kernel/linux/arm-autonomy-kmeta/features/arm-autonomy/xen-host.cfg
@@ -1,38 +1,10 @@
-CONFIG_PARAVIRT=y
-CONFIG_XEN=y
-
-CONFIG_BLOCK=y
 CONFIG_XEN_BLKDEV_BACKEND=y
 
-CONFIG_SCSI=y
 CONFIG_TARGET_CORE=y
 CONFIG_XEN_SCSI_BACKEND=y
 
-CONFIG_NET=y
 CONFIG_XEN_NETDEV_BACKEND=y
 
-CONFIG_HVC_IRQ=y
-
-CONFIG_HVC_XEN=y
-
-CONFIG_WATCHDOG=y
-CONFIG_XEN_WDT=y
-
-CONFIG_XEN_BALLOON=y
-
-CONFIG_XEN_DEV_EVTCHN=y
-
-CONFIG_XENFS=y
-CONFIG_XEN_COMPAT_XENFS=y
-
-CONFIG_XEN_SYS_HYPERVISOR=y
-CONFIG_XEN_GNTDEV=y
-CONFIG_XEN_GRANT_DEV_ALLOC=y
-CONFIG_SWIOTLB_XEN=y
-
-CONFIG_XEN_EFI=y
-CONFIG_XEN_AUTO_XLATE=y
-
 # For LVM2 we need Multiple Devices and Device Mapper support
 CONFIG_MD=y
 CONFIG_BLK_DEV_DM=y
diff --git a/meta-arm-autonomy/recipes-kernel/linux/arm-autonomy-kmeta/features/arm-autonomy/xen-host.scc b/meta-arm-autonomy/recipes-kernel/linux/arm-autonomy-kmeta/features/arm-autonomy/xen-host.scc
index 61b96a2d..71857753 100644
--- a/meta-arm-autonomy/recipes-kernel/linux/arm-autonomy-kmeta/features/arm-autonomy/xen-host.scc
+++ b/meta-arm-autonomy/recipes-kernel/linux/arm-autonomy-kmeta/features/arm-autonomy/xen-host.scc
@@ -1,5 +1,3 @@
 define KFEATURE_DESCRIPTION "Enable XEN Host Drivers on autonomy systems"
 
 kconf non-hardware xen-host.cfg
-
-patch 0001-xen-arm-do-not-setup-the-runstate-info-page-if-kpti-.patch
diff --git a/meta-arm-autonomy/recipes-kernel/linux/linux-arm-autonomy.inc b/meta-arm-autonomy/recipes-kernel/linux/linux-arm-autonomy.inc
index d59ca8ff..c5cb66d2 100644
--- a/meta-arm-autonomy/recipes-kernel/linux/linux-arm-autonomy.inc
+++ b/meta-arm-autonomy/recipes-kernel/linux/linux-arm-autonomy.inc
@@ -7,6 +7,11 @@ FILESEXTRAPATHS_prepend := "${THISDIR}:"
 #
 SRC_URI_append = " file://arm-autonomy-kmeta;type=kmeta;name=arm-autonomy-kmeta;destsuffix=arm-autonomy-kmeta"
 
+# Add common Xen (host and guest) configs and patches
+KERNEL_FEATURES += "${@bb.utils.contains_any('DISTRO_FEATURES', \
+        'arm-autonomy-host arm-autonomy-guest', \
+        'features/arm-autonomy/xen-common.scc', '', d)}"
+
 
 # Add xen host drivers to kernel if arm-autonomy-host is activated
 KERNEL_FEATURES += "${@bb.utils.contains('DISTRO_FEATURES', \
@@ -20,6 +25,7 @@ KERNEL_FEATURES += "${@bb.utils.contains('DISTRO_FEATURES', \
 KERNEL_FEATURES += "${@bb.utils.contains('DISTRO_FEATURES', \
         'arm-autonomy-guest', 'features/arm-autonomy/xen-guest.scc', '', d)}"
 
+
 # Add support for arm64-autonomy-guest machine
 COMPATIBLE_MACHINE_arm64-autonomy-guest = "arm64-autonomy-guest"
 KMACHINE_arm64-autonomy-guest = "arm64-autonomy-guest"