diff --git a/packages/kernel-6.18/config-bottlerocket b/packages/kernel-6.18/config-bottlerocket
index 816d8ae6..c35069ef 100644
--- a/packages/kernel-6.18/config-bottlerocket
+++ b/packages/kernel-6.18/config-bottlerocket
@@ -142,7 +142,6 @@ CONFIG_ZRAM_DEF_COMP_LZ4=y
 
 # Add virtio drivers for development setups running as guests in qemu
 CONFIG_VIRTIO_CONSOLE=m
-CONFIG_HW_RANDOM_VIRTIO=m
 
 # Add support for IPMI drivers
 CONFIG_IPMI_HANDLER=m
@@ -262,3 +261,18 @@ CONFIG_CEPH_FS_SECURITY_LABEL=y
 # Disable ext4/jbd2 debug options for production (reduces latency overhead)
 # CONFIG_EXT4_DEBUG is not set
 # CONFIG_JBD2_DEBUG is not set
+
+# Nitro Security Module for AWS Nitro Enclaves
+CONFIG_NSM=y
+
+# Firecracker virtio/networking built-in (not modules)
+CONFIG_VIRTIO_MMIO=y
+CONFIG_VIRTIO_NET=y
+CONFIG_VIRTIO_BALLOON=y
+CONFIG_VIRTIO_VSOCKETS=y
+CONFIG_HW_RANDOM_VIRTIO=y
+CONFIG_PTP_1588_CLOCK_KVM=y
+
+# Dependencies for VIRTIO_VSOCKETS and HW_RANDOM_VIRTIO built-in
+CONFIG_VSOCKETS=y
+CONFIG_HW_RANDOM=y
diff --git a/packages/kernel-6.18/config-bottlerocket-aarch64 b/packages/kernel-6.18/config-bottlerocket-aarch64
index ff8bfea7..d03aaea8 100644
--- a/packages/kernel-6.18/config-bottlerocket-aarch64
+++ b/packages/kernel-6.18/config-bottlerocket-aarch64
@@ -5,3 +5,6 @@ CONFIG_EFI_ZBOOT=y
 
 # Disable unused filesystems on aarch64
 # CONFIG_JFFS2_FS is not set
+
+# Firecracker requires PL031 RTC for timekeeping on aarch64
+CONFIG_RTC_DRV_PL031=y
diff --git a/packages/kernel-6.18/config-full-bottlerocket-aarch64-on-aarch64 b/packages/kernel-6.18/config-full-bottlerocket-aarch64-on-aarch64
index 59260e43..8c3c9517 100644
--- a/packages/kernel-6.18/config-full-bottlerocket-aarch64-on-aarch64
+++ b/packages/kernel-6.18/config-full-bottlerocket-aarch64-on-aarch64
@@ -1855,11 +1855,11 @@ CONFIG_OPENVSWITCH=m
 CONFIG_OPENVSWITCH_GRE=m
 CONFIG_OPENVSWITCH_VXLAN=m
 CONFIG_OPENVSWITCH_GENEVE=m
-CONFIG_VSOCKETS=m
+CONFIG_VSOCKETS=y
 CONFIG_VSOCKETS_DIAG=m
 CONFIG_VSOCKETS_LOOPBACK=m
-CONFIG_VIRTIO_VSOCKETS=m
-CONFIG_VIRTIO_VSOCKETS_COMMON=m
+CONFIG_VIRTIO_VSOCKETS=y
+CONFIG_VIRTIO_VSOCKETS_COMMON=y
 CONFIG_NETLINK_DIAG=m
 CONFIG_MPLS=y
 CONFIG_NET_MPLS_GSO=m
@@ -1920,7 +1920,7 @@ CONFIG_NET_SOCK_MSG=y
 CONFIG_NET_DEVLINK=y
 CONFIG_PAGE_POOL=y
 CONFIG_PAGE_POOL_STATS=y
-CONFIG_FAILOVER=m
+CONFIG_FAILOVER=y
 CONFIG_ETHTOOL_NETLINK=y
 
 #
@@ -2372,7 +2372,7 @@ CONFIG_NVME_TCP=m
 # CONFIG_OPEN_DICE is not set
 # CONFIG_NTSYNC is not set
 # CONFIG_VCPU_STALL_DETECTOR is not set
-CONFIG_NSM=m
+CONFIG_NSM=y
 # CONFIG_MCHP_LAN966X_PCI is not set
 # CONFIG_C2PORT is not set
 
@@ -2604,7 +2604,7 @@ CONFIG_TUN=m
 CONFIG_TAP=m
 # CONFIG_TUN_VNET_CROSS_LE is not set
 CONFIG_VETH=m
-CONFIG_VIRTIO_NET=m
+CONFIG_VIRTIO_NET=y
 CONFIG_NLMON=m
 CONFIG_NETKIT=y
 CONFIG_NET_VRF=m
@@ -2878,7 +2878,7 @@ CONFIG_SLHC=m
 CONFIG_VMXNET3=m
 # CONFIG_FUJITSU_ES is not set
 CONFIG_NETDEVSIM=m
-CONFIG_NET_FAILOVER=m
+CONFIG_NET_FAILOVER=y
 # CONFIG_ISDN is not set
 
 #
@@ -3068,10 +3068,10 @@ CONFIG_IPMI_SI=m
 # CONFIG_IPMI_SSIF is not set
 CONFIG_IPMI_WATCHDOG=m
 CONFIG_IPMI_POWEROFF=m
-CONFIG_HW_RANDOM=m
+CONFIG_HW_RANDOM=y
 # CONFIG_HW_RANDOM_TIMERIOMEM is not set
 # CONFIG_HW_RANDOM_BA431 is not set
-CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_HW_RANDOM_VIRTIO=y
 # CONFIG_HW_RANDOM_CCTRNG is not set
 # CONFIG_HW_RANDOM_XIPHERA is not set
 CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=m
@@ -3082,6 +3082,7 @@ CONFIG_HW_RANDOM_GRAVITON=m
 # CONFIG_DEVPORT is not set
 CONFIG_TCG_TPM=y
 # CONFIG_TCG_TPM2_HMAC is not set
+CONFIG_HW_RANDOM_TPM=y
 CONFIG_TCG_TIS_CORE=y
 CONFIG_TCG_TIS=y
 CONFIG_TCG_TIS_SPI=y
@@ -3257,7 +3258,7 @@ CONFIG_PTP_1588_CLOCK=y
 CONFIG_PTP_1588_CLOCK_OPTIONAL=y
 # CONFIG_DP83640_PHY is not set
 # CONFIG_PTP_1588_CLOCK_INES is not set
-CONFIG_PTP_1588_CLOCK_KVM=m
+CONFIG_PTP_1588_CLOCK_KVM=y
 CONFIG_PTP_1588_CLOCK_VMCLOCK=y
 # CONFIG_PTP_1588_CLOCK_IDT82P33 is not set
 # CONFIG_PTP_1588_CLOCK_IDTCM is not set
@@ -4790,7 +4791,7 @@ CONFIG_RTC_DRV_EFI=y
 # on-CPU RTC drivers
 #
 # CONFIG_RTC_DRV_PL030 is not set
-# CONFIG_RTC_DRV_PL031 is not set
+CONFIG_RTC_DRV_PL031=y
 # CONFIG_RTC_DRV_CADENCE is not set
 # CONFIG_RTC_DRV_FTRTC010 is not set
 # CONFIG_RTC_DRV_TEGRA is not set
@@ -4906,10 +4907,10 @@ CONFIG_VIRTIO_PCI_LIB_LEGACY=y
 CONFIG_VIRTIO_MENU=y
 CONFIG_VIRTIO_PCI=y
 CONFIG_VIRTIO_PCI_LEGACY=y
-CONFIG_VIRTIO_BALLOON=m
+CONFIG_VIRTIO_BALLOON=y
 # CONFIG_VIRTIO_MEM is not set
 # CONFIG_VIRTIO_INPUT is not set
-CONFIG_VIRTIO_MMIO=m
+CONFIG_VIRTIO_MMIO=y
 CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
 # CONFIG_VIRTIO_DEBUG is not set
 # CONFIG_VIRTIO_RTC is not set
diff --git a/packages/kernel-6.18/config-full-bottlerocket-aarch64-on-x86_64 b/packages/kernel-6.18/config-full-bottlerocket-aarch64-on-x86_64
index 59260e43..8c3c9517 100644
--- a/packages/kernel-6.18/config-full-bottlerocket-aarch64-on-x86_64
+++ b/packages/kernel-6.18/config-full-bottlerocket-aarch64-on-x86_64
@@ -1855,11 +1855,11 @@ CONFIG_OPENVSWITCH=m
 CONFIG_OPENVSWITCH_GRE=m
 CONFIG_OPENVSWITCH_VXLAN=m
 CONFIG_OPENVSWITCH_GENEVE=m
-CONFIG_VSOCKETS=m
+CONFIG_VSOCKETS=y
 CONFIG_VSOCKETS_DIAG=m
 CONFIG_VSOCKETS_LOOPBACK=m
-CONFIG_VIRTIO_VSOCKETS=m
-CONFIG_VIRTIO_VSOCKETS_COMMON=m
+CONFIG_VIRTIO_VSOCKETS=y
+CONFIG_VIRTIO_VSOCKETS_COMMON=y
 CONFIG_NETLINK_DIAG=m
 CONFIG_MPLS=y
 CONFIG_NET_MPLS_GSO=m
@@ -1920,7 +1920,7 @@ CONFIG_NET_SOCK_MSG=y
 CONFIG_NET_DEVLINK=y
 CONFIG_PAGE_POOL=y
 CONFIG_PAGE_POOL_STATS=y
-CONFIG_FAILOVER=m
+CONFIG_FAILOVER=y
 CONFIG_ETHTOOL_NETLINK=y
 
 #
@@ -2372,7 +2372,7 @@ CONFIG_NVME_TCP=m
 # CONFIG_OPEN_DICE is not set
 # CONFIG_NTSYNC is not set
 # CONFIG_VCPU_STALL_DETECTOR is not set
-CONFIG_NSM=m
+CONFIG_NSM=y
 # CONFIG_MCHP_LAN966X_PCI is not set
 # CONFIG_C2PORT is not set
 
@@ -2604,7 +2604,7 @@ CONFIG_TUN=m
 CONFIG_TAP=m
 # CONFIG_TUN_VNET_CROSS_LE is not set
 CONFIG_VETH=m
-CONFIG_VIRTIO_NET=m
+CONFIG_VIRTIO_NET=y
 CONFIG_NLMON=m
 CONFIG_NETKIT=y
 CONFIG_NET_VRF=m
@@ -2878,7 +2878,7 @@ CONFIG_SLHC=m
 CONFIG_VMXNET3=m
 # CONFIG_FUJITSU_ES is not set
 CONFIG_NETDEVSIM=m
-CONFIG_NET_FAILOVER=m
+CONFIG_NET_FAILOVER=y
 # CONFIG_ISDN is not set
 
 #
@@ -3068,10 +3068,10 @@ CONFIG_IPMI_SI=m
 # CONFIG_IPMI_SSIF is not set
 CONFIG_IPMI_WATCHDOG=m
 CONFIG_IPMI_POWEROFF=m
-CONFIG_HW_RANDOM=m
+CONFIG_HW_RANDOM=y
 # CONFIG_HW_RANDOM_TIMERIOMEM is not set
 # CONFIG_HW_RANDOM_BA431 is not set
-CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_HW_RANDOM_VIRTIO=y
 # CONFIG_HW_RANDOM_CCTRNG is not set
 # CONFIG_HW_RANDOM_XIPHERA is not set
 CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=m
@@ -3082,6 +3082,7 @@ CONFIG_HW_RANDOM_GRAVITON=m
 # CONFIG_DEVPORT is not set
 CONFIG_TCG_TPM=y
 # CONFIG_TCG_TPM2_HMAC is not set
+CONFIG_HW_RANDOM_TPM=y
 CONFIG_TCG_TIS_CORE=y
 CONFIG_TCG_TIS=y
 CONFIG_TCG_TIS_SPI=y
@@ -3257,7 +3258,7 @@ CONFIG_PTP_1588_CLOCK=y
 CONFIG_PTP_1588_CLOCK_OPTIONAL=y
 # CONFIG_DP83640_PHY is not set
 # CONFIG_PTP_1588_CLOCK_INES is not set
-CONFIG_PTP_1588_CLOCK_KVM=m
+CONFIG_PTP_1588_CLOCK_KVM=y
 CONFIG_PTP_1588_CLOCK_VMCLOCK=y
 # CONFIG_PTP_1588_CLOCK_IDT82P33 is not set
 # CONFIG_PTP_1588_CLOCK_IDTCM is not set
@@ -4790,7 +4791,7 @@ CONFIG_RTC_DRV_EFI=y
 # on-CPU RTC drivers
 #
 # CONFIG_RTC_DRV_PL030 is not set
-# CONFIG_RTC_DRV_PL031 is not set
+CONFIG_RTC_DRV_PL031=y
 # CONFIG_RTC_DRV_CADENCE is not set
 # CONFIG_RTC_DRV_FTRTC010 is not set
 # CONFIG_RTC_DRV_TEGRA is not set
@@ -4906,10 +4907,10 @@ CONFIG_VIRTIO_PCI_LIB_LEGACY=y
 CONFIG_VIRTIO_MENU=y
 CONFIG_VIRTIO_PCI=y
 CONFIG_VIRTIO_PCI_LEGACY=y
-CONFIG_VIRTIO_BALLOON=m
+CONFIG_VIRTIO_BALLOON=y
 # CONFIG_VIRTIO_MEM is not set
 # CONFIG_VIRTIO_INPUT is not set
-CONFIG_VIRTIO_MMIO=m
+CONFIG_VIRTIO_MMIO=y
 CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
 # CONFIG_VIRTIO_DEBUG is not set
 # CONFIG_VIRTIO_RTC is not set
diff --git a/packages/kernel-6.18/config-full-bottlerocket-x86_64-on-aarch64 b/packages/kernel-6.18/config-full-bottlerocket-x86_64-on-aarch64
index 6125bd4f..09043416 100644
--- a/packages/kernel-6.18/config-full-bottlerocket-x86_64-on-aarch64
+++ b/packages/kernel-6.18/config-full-bottlerocket-x86_64-on-aarch64
@@ -1896,12 +1896,12 @@ CONFIG_OPENVSWITCH=m
 CONFIG_OPENVSWITCH_GRE=m
 CONFIG_OPENVSWITCH_VXLAN=m
 CONFIG_OPENVSWITCH_GENEVE=m
-CONFIG_VSOCKETS=m
+CONFIG_VSOCKETS=y
 CONFIG_VSOCKETS_DIAG=m
 CONFIG_VSOCKETS_LOOPBACK=m
 CONFIG_VMWARE_VMCI_VSOCKETS=m
-CONFIG_VIRTIO_VSOCKETS=m
-CONFIG_VIRTIO_VSOCKETS_COMMON=m
+CONFIG_VIRTIO_VSOCKETS=y
+CONFIG_VIRTIO_VSOCKETS_COMMON=y
 CONFIG_HYPERV_VSOCKETS=m
 CONFIG_NETLINK_DIAG=m
 CONFIG_MPLS=y
@@ -1963,7 +1963,7 @@ CONFIG_NET_SOCK_MSG=y
 CONFIG_NET_DEVLINK=y
 CONFIG_PAGE_POOL=y
 CONFIG_PAGE_POOL_STATS=y
-CONFIG_FAILOVER=m
+CONFIG_FAILOVER=y
 CONFIG_ETHTOOL_NETLINK=y
 
 #
@@ -2269,7 +2269,7 @@ CONFIG_VMWARE_BALLOON=m
 # CONFIG_XILINX_SDFEC is not set
 # CONFIG_SYSGENID is not set
 # CONFIG_NTSYNC is not set
-CONFIG_NSM=m
+CONFIG_NSM=y
 # CONFIG_C2PORT is not set
 
 #
@@ -2501,7 +2501,7 @@ CONFIG_TUN=m
 CONFIG_TAP=m
 # CONFIG_TUN_VNET_CROSS_LE is not set
 CONFIG_VETH=m
-CONFIG_VIRTIO_NET=m
+CONFIG_VIRTIO_NET=y
 CONFIG_NLMON=m
 CONFIG_NETKIT=y
 CONFIG_NET_VRF=m
@@ -2761,7 +2761,7 @@ CONFIG_VMXNET3=m
 # CONFIG_FUJITSU_ES is not set
 CONFIG_HYPERV_NET=m
 CONFIG_NETDEVSIM=m
-CONFIG_NET_FAILOVER=m
+CONFIG_NET_FAILOVER=y
 # CONFIG_ISDN is not set
 
 #
@@ -2960,13 +2960,13 @@ CONFIG_IPMI_SI=m
 # CONFIG_IPMI_SSIF is not set
 CONFIG_IPMI_WATCHDOG=m
 CONFIG_IPMI_POWEROFF=m
-CONFIG_HW_RANDOM=m
+CONFIG_HW_RANDOM=y
 # CONFIG_HW_RANDOM_TIMERIOMEM is not set
 CONFIG_HW_RANDOM_INTEL=m
 CONFIG_HW_RANDOM_AMD=m
 # CONFIG_HW_RANDOM_BA431 is not set
 # CONFIG_HW_RANDOM_VIA is not set
-CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_HW_RANDOM_VIRTIO=y
 # CONFIG_HW_RANDOM_XIPHERA is not set
 # CONFIG_APPLICOM is not set
 # CONFIG_MWAVE is not set
@@ -2979,6 +2979,7 @@ CONFIG_HPET_MMAP=y
 CONFIG_HANGCHECK_TIMER=m
 CONFIG_TCG_TPM=y
 CONFIG_TCG_TPM2_HMAC=y
+CONFIG_HW_RANDOM_TPM=y
 CONFIG_TCG_TIS_CORE=y
 CONFIG_TCG_TIS=y
 # CONFIG_TCG_TIS_I2C is not set
@@ -3098,7 +3099,7 @@ CONFIG_PTP_1588_CLOCK=y
 CONFIG_PTP_1588_CLOCK_OPTIONAL=y
 # CONFIG_DP83640_PHY is not set
 # CONFIG_PTP_1588_CLOCK_INES is not set
-CONFIG_PTP_1588_CLOCK_KVM=m
+CONFIG_PTP_1588_CLOCK_KVM=y
 CONFIG_PTP_1588_CLOCK_VMCLOCK=y
 # CONFIG_PTP_1588_CLOCK_IDT82P33 is not set
 # CONFIG_PTP_1588_CLOCK_IDTCM is not set
@@ -4501,10 +4502,10 @@ CONFIG_VIRTIO_MENU=y
 CONFIG_VIRTIO_PCI=y
 CONFIG_VIRTIO_PCI_ADMIN_LEGACY=y
 CONFIG_VIRTIO_PCI_LEGACY=y
-CONFIG_VIRTIO_BALLOON=m
+CONFIG_VIRTIO_BALLOON=y
 CONFIG_VIRTIO_MEM=m
 # CONFIG_VIRTIO_INPUT is not set
-CONFIG_VIRTIO_MMIO=m
+CONFIG_VIRTIO_MMIO=y
 CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
 # CONFIG_VIRTIO_DEBUG is not set
 # CONFIG_VIRTIO_RTC is not set
diff --git a/packages/kernel-6.18/config-full-bottlerocket-x86_64-on-x86_64 b/packages/kernel-6.18/config-full-bottlerocket-x86_64-on-x86_64
index bb49aa74..e5e373c2 100644
--- a/packages/kernel-6.18/config-full-bottlerocket-x86_64-on-x86_64
+++ b/packages/kernel-6.18/config-full-bottlerocket-x86_64-on-x86_64
@@ -1898,12 +1898,12 @@ CONFIG_OPENVSWITCH=m
 CONFIG_OPENVSWITCH_GRE=m
 CONFIG_OPENVSWITCH_VXLAN=m
 CONFIG_OPENVSWITCH_GENEVE=m
-CONFIG_VSOCKETS=m
+CONFIG_VSOCKETS=y
 CONFIG_VSOCKETS_DIAG=m
 CONFIG_VSOCKETS_LOOPBACK=m
 CONFIG_VMWARE_VMCI_VSOCKETS=m
-CONFIG_VIRTIO_VSOCKETS=m
-CONFIG_VIRTIO_VSOCKETS_COMMON=m
+CONFIG_VIRTIO_VSOCKETS=y
+CONFIG_VIRTIO_VSOCKETS_COMMON=y
 CONFIG_HYPERV_VSOCKETS=m
 CONFIG_NETLINK_DIAG=m
 CONFIG_MPLS=y
@@ -1965,7 +1965,7 @@ CONFIG_NET_SOCK_MSG=y
 CONFIG_NET_DEVLINK=y
 CONFIG_PAGE_POOL=y
 CONFIG_PAGE_POOL_STATS=y
-CONFIG_FAILOVER=m
+CONFIG_FAILOVER=y
 CONFIG_ETHTOOL_NETLINK=y
 
 #
@@ -2271,7 +2271,7 @@ CONFIG_VMWARE_BALLOON=m
 # CONFIG_XILINX_SDFEC is not set
 # CONFIG_SYSGENID is not set
 # CONFIG_NTSYNC is not set
-CONFIG_NSM=m
+CONFIG_NSM=y
 # CONFIG_C2PORT is not set
 
 #
@@ -2503,7 +2503,7 @@ CONFIG_TUN=m
 CONFIG_TAP=m
 # CONFIG_TUN_VNET_CROSS_LE is not set
 CONFIG_VETH=m
-CONFIG_VIRTIO_NET=m
+CONFIG_VIRTIO_NET=y
 CONFIG_NLMON=m
 CONFIG_NETKIT=y
 CONFIG_NET_VRF=m
@@ -2763,7 +2763,7 @@ CONFIG_VMXNET3=m
 # CONFIG_FUJITSU_ES is not set
 CONFIG_HYPERV_NET=m
 CONFIG_NETDEVSIM=m
-CONFIG_NET_FAILOVER=m
+CONFIG_NET_FAILOVER=y
 # CONFIG_ISDN is not set
 
 #
@@ -2962,13 +2962,13 @@ CONFIG_IPMI_SI=m
 # CONFIG_IPMI_SSIF is not set
 CONFIG_IPMI_WATCHDOG=m
 CONFIG_IPMI_POWEROFF=m
-CONFIG_HW_RANDOM=m
+CONFIG_HW_RANDOM=y
 # CONFIG_HW_RANDOM_TIMERIOMEM is not set
 CONFIG_HW_RANDOM_INTEL=m
 CONFIG_HW_RANDOM_AMD=m
 # CONFIG_HW_RANDOM_BA431 is not set
 # CONFIG_HW_RANDOM_VIA is not set
-CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_HW_RANDOM_VIRTIO=y
 # CONFIG_HW_RANDOM_XIPHERA is not set
 # CONFIG_APPLICOM is not set
 # CONFIG_MWAVE is not set
@@ -2981,6 +2981,7 @@ CONFIG_HPET_MMAP=y
 CONFIG_HANGCHECK_TIMER=m
 CONFIG_TCG_TPM=y
 CONFIG_TCG_TPM2_HMAC=y
+CONFIG_HW_RANDOM_TPM=y
 CONFIG_TCG_TIS_CORE=y
 CONFIG_TCG_TIS=y
 # CONFIG_TCG_TIS_I2C is not set
@@ -3100,7 +3101,7 @@ CONFIG_PTP_1588_CLOCK=y
 CONFIG_PTP_1588_CLOCK_OPTIONAL=y
 # CONFIG_DP83640_PHY is not set
 # CONFIG_PTP_1588_CLOCK_INES is not set
-CONFIG_PTP_1588_CLOCK_KVM=m
+CONFIG_PTP_1588_CLOCK_KVM=y
 CONFIG_PTP_1588_CLOCK_VMCLOCK=y
 # CONFIG_PTP_1588_CLOCK_IDT82P33 is not set
 # CONFIG_PTP_1588_CLOCK_IDTCM is not set
@@ -4503,10 +4504,10 @@ CONFIG_VIRTIO_MENU=y
 CONFIG_VIRTIO_PCI=y
 CONFIG_VIRTIO_PCI_ADMIN_LEGACY=y
 CONFIG_VIRTIO_PCI_LEGACY=y
-CONFIG_VIRTIO_BALLOON=m
+CONFIG_VIRTIO_BALLOON=y
 CONFIG_VIRTIO_MEM=m
 # CONFIG_VIRTIO_INPUT is not set
-CONFIG_VIRTIO_MMIO=m
+CONFIG_VIRTIO_MMIO=y
 CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
 # CONFIG_VIRTIO_DEBUG is not set
 # CONFIG_VIRTIO_RTC is not set
diff --git a/packages/kernel-6.18/kernel-6.18.spec b/packages/kernel-6.18/kernel-6.18.spec
index 0a3c6dc5..b4859d42 100644
--- a/packages/kernel-6.18/kernel-6.18.spec
+++ b/packages/kernel-6.18/kernel-6.18.spec
@@ -682,8 +682,7 @@ install -p -m 0644 %{S:301} %{buildroot}%{_cross_bootconfigdir}/05-vmware.conf
 %{_cross_kmoddir}/kernel/drivers/char/hangcheck-timer.%{_ko}
 %{_cross_kmoddir}/kernel/drivers/char/nvram.%{_ko}
 %endif
-%{_cross_kmoddir}/kernel/drivers/char/hw_random/rng-core.%{_ko}
-%{_cross_kmoddir}/kernel/drivers/char/hw_random/virtio-rng.%{_ko}
+
 %if "%{_cross_arch}" == "x86_64"
 %{_cross_kmoddir}/kernel/drivers/char/hw_random/amd-rng.%{_ko}
 %{_cross_kmoddir}/kernel/drivers/char/hw_random/intel-rng.%{_ko}
@@ -840,7 +839,6 @@ install -p -m 0644 %{S:301} %{buildroot}%{_cross_bootconfigdir}/05-vmware.conf
 %{_cross_kmoddir}/kernel/drivers/misc/vmw_balloon.%{_ko}
 %{_cross_kmoddir}/kernel/drivers/misc/vmw_vmci/vmw_vmci.%{_ko}
 %endif
-%{_cross_kmoddir}/kernel/drivers/misc/nsm.%{_ko}
 %{_cross_kmoddir}/kernel/drivers/net/bonding/bonding.%{_ko}
 %{_cross_kmoddir}/kernel/drivers/net/dummy.%{_ko}
 
@@ -872,7 +870,6 @@ install -p -m 0644 %{S:301} %{buildroot}%{_cross_bootconfigdir}/05-vmware.conf
 %{_cross_kmoddir}/kernel/drivers/net/mdio/acpi_mdio.%{_ko}
 %{_cross_kmoddir}/kernel/drivers/net/mdio/fwnode_mdio.%{_ko}
 %{_cross_kmoddir}/kernel/drivers/net/netdevsim/netdevsim.%{_ko}
-%{_cross_kmoddir}/kernel/drivers/net/net_failover.%{_ko}
 %{_cross_kmoddir}/kernel/drivers/net/nlmon.%{_ko}
 %{_cross_kmoddir}/kernel/drivers/net/phy/fixed_phy.%{_ko}
 %{_cross_kmoddir}/kernel/drivers/net/phy/libphy.%{_ko}
@@ -896,7 +893,6 @@ install -p -m 0644 %{S:301} %{buildroot}%{_cross_bootconfigdir}/05-vmware.conf
 %{_cross_kmoddir}/kernel/drivers/net/team/team_mode_roundrobin.%{_ko}
 %{_cross_kmoddir}/kernel/drivers/net/tun.%{_ko}
 %{_cross_kmoddir}/kernel/drivers/net/veth.%{_ko}
-%{_cross_kmoddir}/kernel/drivers/net/virtio_net.%{_ko}
 %{_cross_kmoddir}/kernel/drivers/net/vmxnet3/vmxnet3.%{_ko}
 %{_cross_kmoddir}/kernel/drivers/net/vrf.%{_ko}
 %{_cross_kmoddir}/kernel/drivers/net/vxlan/vxlan.%{_ko}
@@ -922,7 +918,6 @@ install -p -m 0644 %{S:301} %{buildroot}%{_cross_bootconfigdir}/05-vmware.conf
 %endif
 %{_cross_kmoddir}/kernel/drivers/pps/clients/pps-gpio.%{_ko}
 %{_cross_kmoddir}/kernel/drivers/pps/clients/pps-ldisc.%{_ko}
-%{_cross_kmoddir}/kernel/drivers/ptp/ptp_kvm.%{_ko}
 %if "%{_cross_arch}" == "x86_64"
 %{_cross_kmoddir}/kernel/drivers/ras/amd/atl/amd_atl.%{_ko}
 %{_cross_kmoddir}/kernel/drivers/ras/amd/fmpm.%{_ko}
@@ -984,8 +979,6 @@ install -p -m 0644 %{S:301} %{buildroot}%{_cross_bootconfigdir}/05-vmware.conf
 %if "%{_cross_arch}" == "aarch64"
 %{_cross_kmoddir}/kernel/drivers/virt/nitro_enclaves/nitro_enclaves.%{_ko}
 %endif
-%{_cross_kmoddir}/kernel/drivers/virtio/virtio_balloon.%{_ko}
-%{_cross_kmoddir}/kernel/drivers/virtio/virtio_mmio.%{_ko}
 %if "%{_cross_arch}" == "x86_64"
 %{_cross_kmoddir}/kernel/drivers/virtio/virtio_mem.%{_ko}
 %endif
@@ -1172,7 +1165,6 @@ install -p -m 0644 %{S:301} %{buildroot}%{_cross_bootconfigdir}/05-vmware.conf
 %{_cross_kmoddir}/kernel/net/bridge/netfilter/ebtables.%{_ko}
 %{_cross_kmoddir}/kernel/net/bridge/netfilter/nft_reject_bridge.%{_ko}
 %{_cross_kmoddir}/kernel/net/ceph/libceph.%{_ko}
-%{_cross_kmoddir}/kernel/net/core/failover.%{_ko}
 %{_cross_kmoddir}/kernel/net/core/selftests.%{_ko}
 %{_cross_kmoddir}/kernel/net/dns_resolver/dns_resolver.%{_ko}
 %{_cross_kmoddir}/kernel/net/ife/ife.%{_ko}
@@ -1504,10 +1496,7 @@ install -p -m 0644 %{S:301} %{buildroot}%{_cross_bootconfigdir}/05-vmware.conf
 %if "%{_cross_arch}" == "x86_64"
 %{_cross_kmoddir}/kernel/net/vmw_vsock/hv_sock.%{_ko}
 %endif
-%{_cross_kmoddir}/kernel/net/vmw_vsock/vmw_vsock_virtio_transport_common.%{_ko}
-%{_cross_kmoddir}/kernel/net/vmw_vsock/vmw_vsock_virtio_transport.%{_ko}
 %{_cross_kmoddir}/kernel/net/vmw_vsock/vsock_diag.%{_ko}
-%{_cross_kmoddir}/kernel/net/vmw_vsock/vsock.%{_ko}
 %{_cross_kmoddir}/kernel/net/vmw_vsock/vsock_loopback.%{_ko}
 %if "%{_cross_arch}" == "x86_64"
 %{_cross_kmoddir}/kernel/net/vmw_vsock/vmw_vsock_vmci_transport.%{_ko}