diff --git a/device-oriole.mk b/device-oriole.mk
index 430a797..8feef7a 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -23,9 +23,9 @@ $(call soong_config_set,raviole_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOA
 
 
 TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_ORIOLE_VERSION)
-# Keeps flexibility for kasan and ufs builds
-TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_ORIOLE_DIR)
-TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_ORIOLE_DIR)/kernel-headers
+TARGET_KERNEL_DEVICE := raviole
+TARGET_KERNEL_DIR := device/google/$(TARGET_KERNEL_DEVICE)-kernels/$(TARGET_LINUX_KERNEL_VERSION)
+TARGET_KERNEL_PLATFORM_SOURCE := google/gs-$(TARGET_LINUX_KERNEL_VERSION)
 
 DEVICE_PACKAGE_OVERLAYS += device/google/raviole/oriole/overlay
 
@@ -48,14 +48,6 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
 	device/google/gs101/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.oriole.rc
 
-# insmod files. Kernel 5.10 prebuilts don't provide these yet, so provide our
-# own copy if they're not in the prebuilts.
-# TODO(b/369686096): drop this when 5.10 is gone.
-ifeq ($(wildcard $(TARGET_KERNEL_DIR)/init.insmod.*.cfg),)
-PRODUCT_COPY_FILES += \
-	device/google/raviole/init.insmod.oriole.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.oriole.cfg
-endif
-
 # Thermal Config
 PRODUCT_COPY_FILES += \
 	device/google/raviole/thermal_info_config_oriole.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json \
diff --git a/device-raven.mk b/device-raven.mk
index d3ab607..ef005c6 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -23,9 +23,9 @@ $(call soong_config_set,raviole_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOA
 
 
 TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_RAVEN_VERSION)
-# Keeps flexibility for kasan and ufs builds
-TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_RAVEN_DIR)
-TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_RAVEN_DIR)/kernel-headers
+TARGET_KERNEL_DEVICE := raviole
+TARGET_KERNEL_DIR := device/google/$(TARGET_KERNEL_DEVICE)-kernels/$(TARGET_LINUX_KERNEL_VERSION)
+TARGET_KERNEL_PLATFORM_SOURCE := google/gs-$(TARGET_LINUX_KERNEL_VERSION)
 
 $(call inherit-product, device/google/raviole/uwb/uwb_calibration_country.mk)
 
@@ -55,14 +55,6 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
 	device/google/gs101/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.raven.rc
 
-# insmod files. Kernel 5.10 prebuilts don't provide these yet, so provide our
-# own copy if they're not in the prebuilts.
-# TODO(b/369686096): drop this when 5.10 is gone.
-ifeq ($(wildcard $(TARGET_KERNEL_DIR)/init.insmod.*.cfg),)
-PRODUCT_COPY_FILES += \
-	device/google/raviole/init.insmod.raven.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.raven.cfg
-endif
-
 # Thermal Config
 PRODUCT_COPY_FILES += \
 	device/google/raviole/thermal_info_config_raven.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json \
diff --git a/init.insmod.oriole.cfg b/init.insmod.oriole.cfg
deleted file mode 100644
index 0ab8ad5..0000000
--- a/init.insmod.oriole.cfg
+++ /dev/null
@@ -1,17 +0,0 @@
-##########################################################
-#           init.insmod.oriole.cfg                       #
-# This file contains oriole specific kernel modules to   #
-# load at init time by init.insmod.sh script             #
-##########################################################
-
-# Load device specific kernel modules
-# Modules here will be loaded *after* all common modules
-modprobe|bcmdhd4389.ko
-modprobe|ftm5.ko
-modprobe|sec_touch.ko
-modprobe|st33spi.ko
-
-# All device specific modules loaded
-setprop|vendor.device.modules.ready
-setprop|vendor.all.modules.ready
-setprop|vendor.all.devices.ready
diff --git a/init.insmod.raven.cfg b/init.insmod.raven.cfg
deleted file mode 100644
index 84b3239..0000000
--- a/init.insmod.raven.cfg
+++ /dev/null
@@ -1,16 +0,0 @@
-##########################################################
-#           init.insmod.raven.cfg                        #
-# This file contains raven specific kernel modules to    #
-# load at init time by init.insmod.sh script             #
-##########################################################
-
-# Load device specific kernel modules
-# Modules here will be loaded *after* all common modules
-modprobe|bcmdhd4389.ko
-modprobe|sec_touch.ko
-modprobe|st33spi.ko
-
-# All device specific modules loaded
-setprop|vendor.device.modules.ready
-setprop|vendor.all.modules.ready
-setprop|vendor.all.devices.ready
diff --git a/lineage.dependencies b/lineage.dependencies
index 9f79101..6508e39 100644
--- a/lineage.dependencies
+++ b/lineage.dependencies
@@ -2,5 +2,9 @@
   {
     "repository": "android_device_google_gs101",
     "target_path": "device/google/gs101"
+  },
+  {
+    "repository": "android_device_google_raviole-kernels",
+    "target_path": "device/google/raviole-kernels"
   }
 ]