diff --git a/buildroot-external/board/ovos/pc/kernel.config b/buildroot-external/board/ovos/pc/kernel.config
index 3e5e0ad4..f95cc43f 100644
--- a/buildroot-external/board/ovos/pc/kernel.config
+++ b/buildroot-external/board/ovos/pc/kernel.config
@@ -62,6 +62,16 @@ CONFIG_MMC_SDHCI_ACPI=y
 CONFIG_MMC_SDHCI_PCI=y
 CONFIG_X86_INTEL_LPSS=y
 
+CONFIG_SND_HDA=y
+CONFIG_SND_HDA_CORE=y
+CONFIG_SND_HDA_GENERIC=y
+CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_I915=y
+CONFIG_SND_HDA_CODEC_REALTEK=m
+CONFIG_SND_HDA_CODEC_ANALOG=m
+CONFIG_SND_HDA_CODEC_VIA=m
+CONFIG_SND_HDA_CODEC_HDMI=m
+
 CONFIG_SND_SOC=m
 
 CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y
diff --git a/buildroot-external/board/ovos/raspberrypi/kernel.config b/buildroot-external/board/ovos/raspberrypi/kernel.config
index 0096501a..cdf6de1c 100644
--- a/buildroot-external/board/ovos/raspberrypi/kernel.config
+++ b/buildroot-external/board/ovos/raspberrypi/kernel.config
@@ -1,5 +1,4 @@
-CONFIG_ARCH_SUPPORTS_ACPI=y
-CONFIG_ACPI=y
+CONFIG_ACPI=ACPI
 
 CONFIG_EFI=y
 CONFIG_EFI_STUB=y
@@ -25,7 +24,6 @@ CONFIG_VIRTIO_NET=y
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_INPUT=m
 CONFIG_VIRTIO_BLK=y
-CONFIG_VIRTIO_BLK_SCSI=y
 CONFIG_VIRTIO_CONSOLE=m
 CONFIG_VIRTIO_VSOCKETS=m
 CONFIG_VIRTIO_MMIO=y
@@ -38,14 +36,4 @@ CONFIG_NVME_HWMON=y
 
 CONFIG_DRM_VIRTIO_GPU=m
 
-CONFIG_HYPERVISOR_GUEST=y
-CONFIG_HYPERV=y
-CONFIG_HYPERV_UTILS=m
-CONFIG_HYPERV_BALLOON=m
-CONFIG_HYPERV_KEYBOARD=m
-CONFIG_HYPERV_STORAGE=y
-CONFIG_HYPERV_NET=y
-CONFIG_HYPERV_VSOCKETS=m
-CONFIG_PCI_HYPERV=m
-CONFIG_PCI_HYPERV_INTERFACE=m
-CONFIG_FB_HYPERV=y
+CONFIG_HYPERVISOR_GUEST=HYPERVISOR_GUEST
diff --git a/buildroot-external/kernel/device-drivers.config b/buildroot-external/kernel/device-drivers.config
index 914e69c0..114d5876 100644
--- a/buildroot-external/kernel/device-drivers.config
+++ b/buildroot-external/kernel/device-drivers.config
@@ -1,3 +1,5 @@
+CONFIG_USB_GADGET=y
+
 CONFIG_USBIP_CORE=m
 CONFIG_USBIP_VHCI_HCD=m
 CONFIG_USBIP_VHCI_HC_PORTS=8
@@ -8,7 +10,6 @@ CONFIG_USBIP_VUDC=m
 CONFIG_USB_SERIAL=y
 CONFIG_USB_SERIAL_GENERIC=y
 CONFIG_USB_SERIAL_OPTION=m
-CONFIG_USB_SERIAL_WWAN=m
 CONFIG_USB_SERIAL_SIMPLE=m
 CONFIG_USB_SERIAL_CP210X=m
 CONFIG_USB_SERIAL_FTDI_SIO=m
@@ -35,6 +36,9 @@ CONFIG_USB_NET_SMSC95XX=m
 
 CONFIG_MEDIA_CEC_SUPPORT=y
 
+# Required for BT drivers
+CONFIG_SERIAL_DEV_BUS=y
+
 CONFIG_BT_INTEL=m
 CONFIG_BT_BCM=m
 CONFIG_BT_RTL=m
@@ -46,7 +50,6 @@ CONFIG_BT_HCIBTUSB_RTL=y
 CONFIG_RTL_CARDS=m
 CONFIG_RTL8192CU=m
 CONFIG_RTL8XXXU=m
-CONFIG_R8188EU=m
 
 CONFIG_WLAN_VENDOR_MEDIATEK=y
 CONFIG_MT7601U=m
@@ -65,28 +68,20 @@ CONFIG_RT2800USB_UNKNOWN=y
 
 # Multimedia core support
 CONFIG_MEDIA_SUPPORT=y
+CONFIG_MEDIA_SUPPORT_FILTER=n
 CONFIG_MEDIA_CONTROLLER=y
 CONFIG_MEDIA_CONTROLLER_DVB=y
 CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
-CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
 CONFIG_MEDIA_USB_SUPPORT=y
-CONFIG_MEDIA_PCI_SUPPORT=y
 CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_V4L2=m
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
-CONFIG_VIDEO_V4L2_TPG=m
 CONFIG_VIDEO_TVEEPROM=m
-CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_DMA_SG=m
-CONFIG_VIDEOBUF_VMALLOC=m
 CONFIG_VIDEOBUF2_CORE=m
 CONFIG_VIDEOBUF2_V4L2=m
 CONFIG_VIDEOBUF2_MEMOPS=m
-CONFIG_VIDEOBUF2_DMA_CONTIG=m
 CONFIG_VIDEOBUF2_VMALLOC=m
-CONFIG_VIDEOBUF2_DMA_SG=m
-CONFIG_VIDEOBUF2_DVB=m
+CONFIG_MEDIA_PLATFORM_SUPPORT=y
+CONFIG_MEDIA_PLATFORM_DRIVERS=y
 CONFIG_V4L_PLATFORM_DRIVERS=y
 
 # Webcam devices
@@ -144,9 +139,6 @@ CONFIG_USB_GSPCA_XIRLINK_CIT=m
 CONFIG_USB_GSPCA_ZC3XX=m
 CONFIG_USB_PWC=m
 CONFIG_USB_PWC_INPUT_EVDEV=y
-CONFIG_VIDEO_CPIA2=m
-CONFIG_USB_ZR364XX=m
-CONFIG_USB_STKWEBCAM=m
 CONFIG_USB_S2255=m
 
 # Analog capture USB devices
@@ -155,11 +147,6 @@ CONFIG_VIDEO_PVRUSB2=m
 CONFIG_VIDEO_PVRUSB2_SYSFS=y
 CONFIG_VIDEO_PVRUSB2_DVB=y
 CONFIG_VIDEO_HDPVR=m
-CONFIG_VIDEO_USBVISION=m
-CONFIG_VIDEO_STK1160_COMMON=m
-CONFIG_VIDEO_STK1160=m
-CONFIG_VIDEO_SAA7146=m
-CONFIG_VIDEO_SAA7146_VV=m
 
 # Analog/digital capture USB devices
 CONFIG_VIDEO_AU0828=m
@@ -168,9 +155,6 @@ CONFIG_VIDEO_CX231XX=m
 CONFIG_VIDEO_CX231XX_RC=y
 CONFIG_VIDEO_CX231XX_ALSA=m
 CONFIG_VIDEO_CX231XX_DVB=m
-CONFIG_VIDEO_TM6000=m
-CONFIG_VIDEO_TM6000_ALSA=m
-CONFIG_VIDEO_TM6000_DVB=m
 CONFIG_VIDEO_CX2341X=m
 
 # Webcam/capture (analog/digital) USB devices
@@ -182,15 +166,6 @@ CONFIG_VIDEO_EM28XX_RC=m
 
 # Audio devices (USB/PCI)
 CONFIG_SND_USB_AUDIO=m
-CONFIG_SND_HDA=y
-CONFIG_SND_HDA_CORE=y
-CONFIG_SND_HDA_GENERIC=y
-CONFIG_SND_HDA_INTEL=m
-CONFIG_SND_HDA_I915=y
-CONFIG_SND_HDA_CODEC_REALTEK=m
-CONFIG_SND_HDA_CODEC_ANALOG=m
-CONFIG_SND_HDA_CODEC_VIA=m
-CONFIG_SND_HDA_CODEC_HDMI=m
 
 # GPIO support
 CONFIG_GPIOLIB=y
diff --git a/buildroot-external/kernel/docker.config b/buildroot-external/kernel/docker.config
index a9a008de..ff8f9471 100644
--- a/buildroot-external/kernel/docker.config
+++ b/buildroot-external/kernel/docker.config
@@ -1,5 +1,4 @@
 CONFIG_POSIX_MQUEUE=y
-CONFIG_CFQ_GROUP_IOSCHED=y
 CONFIG_CFS_BANDWIDTH=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_NET_SCHED=y
@@ -7,13 +6,11 @@ CONFIG_NET_SCHED=y
 
 CONFIG_CGROUPS=y
 CONFIG_CPUSETS=y
-CONFIG_HUGETLB_PAGE=y
 CONFIG_BLK_CGROUP=y
 CONFIG_BLK_DEV_THROTTLING=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_CGROUP_PIDS=y
 CONFIG_CGROUP_FREEZER=y
-CONFIG_CGROUP_HUGETLB=y
 CONFIG_CGROUP_DEVICE=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_CGROUP_PERF=y
@@ -24,7 +21,6 @@ CONFIG_CGROUP_BPF=y
 CONFIG_BPF_SYSCALL=y
 
 CONFIG_MEMCG=y
-CONFIG_MEMCG_SWAP=y
 
 CONFIG_NAMESPACES=y
 CONFIG_USER_NS=y
@@ -42,16 +38,13 @@ CONFIG_BRIDGE_VLAN_FILTERING=y
 CONFIG_INET=y
 CONFIG_IPV6=y
 CONFIG_INET_ESP=y
-CONFIG_INET_XFRM_MODE_TRANSPORT=y
 CONFIG_NETCONSOLE=y
 CONFIG_VETH=y
 CONFIG_NETFILTER=y
 CONFIG_NF_CONNTRACK=y
 CONFIG_NF_CONNTRACK_TFTP=y
 CONFIG_NF_NAT=y
-CONFIG_NF_NAT_NEEDED=y
 CONFIG_NF_NAT_TFTP=y
-CONFIG_NF_CONNTRACK_IPV4=y
 CONFIG_IP6_NF_IPTABLES=y
 CONFIG_IP6_NF_FILTER=y
 CONFIG_IP6_NF_MANGLE=y
@@ -74,9 +67,7 @@ CONFIG_IP_NF_TARGET_MASQUERADE=y
 CONFIG_IP_NF_TARGET_REDIRECT=y
 CONFIG_BRIDGE=y
 CONFIG_BRIDGE_NETFILTER=y
-CONFIG_XFRM=m
 CONFIG_XFRM_USER=y
-CONFIG_XFRM_ALGO=y
 
 CONFIG_NET_L3_MASTER_DEV=y
 
@@ -85,9 +76,7 @@ CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
 CONFIG_OVERLAY_FS=y
 CONFIG_OVERLAY_FS_METACOPY=y
-CONFIG_VBOXSF_FS=m
 
 CONFIG_CRYPTO_CCM=m
-CONFIG_CRYPTO_GCM=m
+CONFIG_CRYPTO_GCM=y
 CONFIG_CRYPTO_CMAC=m
-CONFIG_CRYPTO_ARC4=m
diff --git a/buildroot-external/kernel/ovos.config b/buildroot-external/kernel/ovos.config
index b1d6aa6a..1fc25e3c 100644
--- a/buildroot-external/kernel/ovos.config
+++ b/buildroot-external/kernel/ovos.config
@@ -1,13 +1,20 @@
 CONFIG_LOCALVERSION="-ovos-buildroot"
-CONFIG_KERNEL_LZO=y
-# CONFIG_KERNEL_GZIP is not set
+CONFIG_EXPERT=y
 
 # GCC plugins are disabled by linux.mk, disable them here to reduce
 # linux-diff-config noise
-
 CONFIG_GCC_PLUGINS=n
+
 CONFIG_CMDLINE=""
 CONFIG_PANIC_TIMEOUT=5
+
+# CONFIG_PREEMPT_NONE is not set
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+CONFIG_PREEMPT_RT=y
+CONFIG_PREEMPT_COUNT=y
+CONFIG_PREEMPTION=y
+
 CONFIG_PSI=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
@@ -33,12 +40,15 @@ CONFIG_EXFAT_FS=m
 CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
 CONFIG_MSDOS_FS=y
 CONFIG_VFAT_FS=y
+
 CONFIG_SQUASHFS=y
 # CONFIG_SQUASHFS_FILE_CACHE is not set
 CONFIG_SQUASHFS_FILE_DIRECT=y
-# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
-# CONFIG_SQUASHFS_DECOMP_MULTI is not set
 CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
+# CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT is not set
+# CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE is not set
+# CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI is not set
+CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU=y
 CONFIG_SQUASHFS_XATTR=y
 CONFIG_SQUASHFS_ZLIB=y
 CONFIG_SQUASHFS_LZ4=y
@@ -48,12 +58,12 @@ CONFIG_SQUASHFS_ZSTD=y
 # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
 # CONFIG_SQUASHFS_EMBEDDED is not set
 CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+
 CONFIG_BTRFS_FS=m
 CONFIG_OVERLAY_FS=y
 CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_TMPFS_XATTR=y
-CONFIG_TMPFS_INODE64=y
 
 CONFIG_SECCOMP=y
 CONFIG_SECCOMP_FILTER=y
@@ -72,7 +82,7 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_LOGO is not set
 # CONFIG_DEBUG_STACK_USAGE is not set
 
-CONFIG_BT=y
+CONFIG_BT=m
 CONFIG_BT_BREDR=y
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
@@ -80,13 +90,11 @@ CONFIG_BT_LE=y
 CONFIG_BT_BNEP=m
 CONFIG_BT_BNEP_MC_FILTER=y
 CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_CMTP=m
 CONFIG_BT_HIDP=m
 CONFIG_BT_LEDS=y
 
 CONFIG_IPV6=y
 CONFIG_IPV6_ROUTER_PREF=y
-CONFIG_IPV6_REACHABILITY_PROBE=y
 CONFIG_IPV6_SIT=m
 
 CONFIG_IP_MROUTE=y
@@ -101,11 +109,11 @@ CONFIG_NF_TABLES_ARP=y
 CONFIG_NF_TPROXY_IPV6=m
 CONFIG_NF_TABLES_IPV6=y
 CONFIG_NF_TABLES_BRIDGE=m
+CONFIG_NF_FLOW_TABLE=m
 
 CONFIG_NFT_NUMGEN=m
 CONFIG_NFT_CT=m
 CONFIG_NFT_FLOW_OFFLOAD=m
-CONFIG_NFT_COUNTER=m
 CONFIG_NFT_CONNLIMIT=m
 CONFIG_NFT_LOG=m
 CONFIG_NFT_LIMIT=m
@@ -113,7 +121,6 @@ CONFIG_NFT_MASQ=m
 CONFIG_NFT_REDIR=m
 CONFIG_NFT_NAT=m
 CONFIG_NFT_TUNNEL=m
-CONFIG_NFT_OBJREF=m
 CONFIG_NFT_QUEUE=m
 CONFIG_NFT_QUOTA=m
 CONFIG_NFT_REJECT=m
@@ -140,6 +147,7 @@ CONFIG_NFT_FIB_IPV6=m
 CONFIG_NFT_BRIDGE_META=m
 CONFIG_NFT_BRIDGE_REJECT=m
 
+CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_NETFILTER_XT_SET=m
 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
 
@@ -176,17 +184,15 @@ CONFIG_WEXT_CORE=y
 CONFIG_WEXT_PROC=y
 CONFIG_CFG80211=m
 CONFIG_CFG80211_WEXT=y
-# CONFIG_CFG80211_CRDA_SUPPORT is not set
 
 CONFIG_CIFS=m
 CONFIG_CIFS_XATTR=y
 CONFIG_CIFS_POSIX=y
-CONFIG_CIFS_ACL=y
 CONFIG_CIFS_DFS_UPCALL=y
 
 CONFIG_WIREGUARD=m
 
-CONFIG_HID=m
+CONFIG_HID=y
 CONFIG_HIDRAW=y
 
 CONFIG_NLS=y
@@ -195,12 +201,3 @@ CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ASCII=y
 CONFIG_NLS_ISO8859_1=y
 CONFIG_NLS_UTF8=y
-
-CONFIG_HAVE_PREEMPT_LAZY=y
-CONFIG_PREEMPT_LAZY=y
-# CONFIG_PREEMPT_NONE is not set
-# CONFIG_PREEMPT_VOLUNTARY is not set
-# CONFIG_PREEMPT is not set
-CONFIG_PREEMPT_RT=y
-CONFIG_PREEMPT_COUNT=y
-CONFIG_PREEMPTION=y