diff --git a/audio_kernel_modules.mk b/audio_kernel_modules.mk
new file mode 100644
index 0000000000..b5cc310569
--- /dev/null
+++ b/audio_kernel_modules.mk
@@ -0,0 +1,47 @@
+# Build audio kernel driver
+ifeq ($(TARGET_USES_QMAA),true)
+ifeq ($(TARGET_USES_QMAA_OVERRIDE_AUDIO),true)
+BUILD_AUDIO_MODULES := true
+else
+BUILD_AUDIO_MODULES := false
+endif
+else
+BUILD_AUDIO_MODULES := true
+endif
+
+ifeq ($(BUILD_AUDIO_MODULES),true)
+ifneq ($(TARGET_BOARD_AUTO),true)
+ifeq ($(call is-board-platform-in-list,$(TARGET_BOARD_PLATFORM)),true)
+AUDIO_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/q6_notifier_dlkm.ko\
+	$(KERNEL_MODULES_OUT)/spf_core_dlkm.ko \
+	$(KERNEL_MODULES_OUT)/audpkt_ion_dlkm.ko \
+	$(KERNEL_MODULES_OUT)/gpr_dlkm.ko \
+	$(KERNEL_MODULES_OUT)/audio_pkt_dlkm.ko \
+	$(KERNEL_MODULES_OUT)/q6_dlkm.ko \
+	$(KERNEL_MODULES_OUT)/adsp_loader_dlkm.ko \
+	$(KERNEL_MODULES_OUT)/audio_prm_dlkm.ko \
+	$(KERNEL_MODULES_OUT)/q6_pdr_dlkm.ko \
+	$(KERNEL_MODULES_OUT)/pinctrl_lpi_dlkm.ko \
+	$(KERNEL_MODULES_OUT)/swr_dlkm.ko \
+	$(KERNEL_MODULES_OUT)/swr_ctrl_dlkm.ko \
+	$(KERNEL_MODULES_OUT)/snd_event_dlkm.ko \
+	$(KERNEL_MODULES_OUT)/wcd_core_dlkm.ko \
+	$(KERNEL_MODULES_OUT)/mbhc_dlkm.ko \
+	$(KERNEL_MODULES_OUT)/swr_dmic_dlkm.ko \
+	$(KERNEL_MODULES_OUT)/wcd9xxx_dlkm.ko \
+	$(KERNEL_MODULES_OUT)/swr_haptics_dlkm.ko \
+	$(KERNEL_MODULES_OUT)/stub_dlkm.ko \
+	$(KERNEL_MODULES_OUT)/machine_dlkm.ko \
+	$(KERNEL_MODULES_OUT)/lpass_cdc_wsa2_macro_dlkm.ko \
+	$(KERNEL_MODULES_OUT)/lpass_cdc_wsa_macro_dlkm.ko \
+	$(KERNEL_MODULES_OUT)/lpass_cdc_va_macro_dlkm.ko \
+	$(KERNEL_MODULES_OUT)/lpass_cdc_rx_macro_dlkm.ko \
+	$(KERNEL_MODULES_OUT)/lpass_cdc_tx_macro_dlkm.ko \
+	$(KERNEL_MODULES_OUT)/lpass_cdc_dlkm.ko \
+	$(KERNEL_MODULES_OUT)/wsa884x_dlkm.ko \
+	$(KERNEL_MODULES_OUT)/wcd938x_dlkm.ko \
+	$(KERNEL_MODULES_OUT)/wcd938x_slave_dlkm.ko \
+	$(KERNEL_MODULES_OUT)/hdmi_dlkm.ko
+endif
+endif
+endif
diff --git a/audio_kernel_vendor_board.mk b/audio_kernel_vendor_board.mk
index 9dc4bbb5f4..4c347e38d0 100644
--- a/audio_kernel_vendor_board.mk
+++ b/audio_kernel_vendor_board.mk
@@ -1,47 +1,2 @@
-# Build audio kernel driver
-ifeq ($(TARGET_USES_QMAA),true)
-ifeq ($(TARGET_USES_QMAA_OVERRIDE_AUDIO),true)
-BUILD_AUDIO_MODULES := true
-else
-BUILD_AUDIO_MODULES := false
-endif
-else
-BUILD_AUDIO_MODULES := true
-endif
-
-ifeq ($(BUILD_AUDIO_MODULES),true)
-ifneq ($(TARGET_BOARD_AUTO),true)
-ifeq ($(call is-board-platform-in-list,$(TARGET_BOARD_PLATFORM)),true)
-BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/q6_notifier_dlkm.ko\
-	$(KERNEL_MODULES_OUT)/spf_core_dlkm.ko \
-	$(KERNEL_MODULES_OUT)/audpkt_ion_dlkm.ko \
-	$(KERNEL_MODULES_OUT)/gpr_dlkm.ko \
-	$(KERNEL_MODULES_OUT)/audio_pkt_dlkm.ko \
-	$(KERNEL_MODULES_OUT)/q6_dlkm.ko \
-	$(KERNEL_MODULES_OUT)/adsp_loader_dlkm.ko \
-	$(KERNEL_MODULES_OUT)/audio_prm_dlkm.ko \
-	$(KERNEL_MODULES_OUT)/q6_pdr_dlkm.ko \
-	$(KERNEL_MODULES_OUT)/pinctrl_lpi_dlkm.ko \
-	$(KERNEL_MODULES_OUT)/swr_dlkm.ko \
-	$(KERNEL_MODULES_OUT)/swr_ctrl_dlkm.ko \
-	$(KERNEL_MODULES_OUT)/snd_event_dlkm.ko \
-	$(KERNEL_MODULES_OUT)/wcd_core_dlkm.ko \
-	$(KERNEL_MODULES_OUT)/mbhc_dlkm.ko \
-	$(KERNEL_MODULES_OUT)/swr_dmic_dlkm.ko \
-	$(KERNEL_MODULES_OUT)/wcd9xxx_dlkm.ko \
-	$(KERNEL_MODULES_OUT)/swr_haptics_dlkm.ko \
-	$(KERNEL_MODULES_OUT)/stub_dlkm.ko \
-	$(KERNEL_MODULES_OUT)/machine_dlkm.ko \
-	$(KERNEL_MODULES_OUT)/lpass_cdc_wsa2_macro_dlkm.ko \
-	$(KERNEL_MODULES_OUT)/lpass_cdc_wsa_macro_dlkm.ko \
-	$(KERNEL_MODULES_OUT)/lpass_cdc_va_macro_dlkm.ko \
-	$(KERNEL_MODULES_OUT)/lpass_cdc_rx_macro_dlkm.ko \
-	$(KERNEL_MODULES_OUT)/lpass_cdc_tx_macro_dlkm.ko \
-	$(KERNEL_MODULES_OUT)/lpass_cdc_dlkm.ko \
-	$(KERNEL_MODULES_OUT)/wsa884x_dlkm.ko \
-	$(KERNEL_MODULES_OUT)/wcd938x_dlkm.ko \
-	$(KERNEL_MODULES_OUT)/wcd938x_slave_dlkm.ko \
-	$(KERNEL_MODULES_OUT)/hdmi_dlkm.ko
-endif
-endif
-endif
+include vendor/qcom/opensource/audio-kernel/audio_kernel_modules.mk
+BOARD_VENDOR_KERNEL_MODULES += $(AUDIO_KERNEL_MODULES)
\ No newline at end of file