diff --git a/BoardConfig.mk b/BoardConfig.mk
index 2cba0a0077bc066d96542ac3e7e784592c0412cf..427e82c87eabac09e9b466813b7b16231f87fc72 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -66,6 +66,7 @@ TARGET_FS_CONFIG_GEN += \
     $(DEVICE_PATH)/config.fs
 
 # Kernel
+include kernel/fairphone/sdm632-prebuilt/BoardConfigKernel.mk
 BOARD_KERNEL_BASE        := 0x80000000
 BOARD_KERNEL_PAGESIZE    := 2048
 BOARD_KERNEL_OFFSET      := 0x00008000
@@ -277,9 +278,8 @@ BOARD_WPA_SUPPLICANT_DRIVER := NL80211
 BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_$(BOARD_WLAN_DEVICE)
 BOARD_HOSTAPD_DRIVER := NL80211
 BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_$(BOARD_WLAN_DEVICE)
-WIFI_DRIVER_FW_PATH_STA := "sta"
-WIFI_DRIVER_FW_PATH_AP  := "ap"
-WIFI_DRIVER_FW_PATH_P2P := "p2p"
+WIFI_DRIVER_MODULE_PATH := "/system/vendor/lib/modules/pronto_wlan.ko"
+WIFI_DRIVER_MODULE_NAME := "wlan"
 TARGET_USES_QCOM_WCNSS_QMI := true
 PRODUCT_VENDOR_MOVE_ENABLED := true
 
diff --git a/device.mk b/device.mk
index 9f87cb2cc70c66f94d3b7dcb22734f24d9e52819..ea4e73c1de06340550e3e57b5019c16b10c70bed 100644
--- a/device.mk
+++ b/device.mk
@@ -17,6 +17,9 @@
 # Vendor blobs
 $(call inherit-product-if-exists, vendor/fairphone/FP3/FP3-vendor.mk)
 
+# Kernel
+$(call inherit-product, kernel/fairphone/sdm632-prebuilt/kernel.mk)
+
 # Installs gsi keys into ramdisk, to boot a GSI with verified boot.
 $(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_keys.mk)