diff --git a/BoardConfig.mk b/BoardConfig.mk
index 8ad418c..07132aa 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -21,7 +21,8 @@ TARGET_KERNEL_CONFIG := dm3q_defconfig
 # Kernel Modules
 BOARD_RECOVERY_RAMDISK_KERNEL_MODULES_LOAD := $(strip $(shell cat $(DEVICE_PATH)/modules.load.recovery))
 BOARD_SYSTEM_KERNEL_MODULES_LOAD := $(strip $(shell cat $(DEVICE_PATH)/modules.load.system_dlkm))
-BOARD_VENDOR_KERNEL_MODULES_BLOCKLIST_FILE := $(DEVICE_PATH)/modules.blocklist
+BOARD_SYSTEM_KERNEL_MODULES_BLOCKLIST_FILE := $(TARGET_KERNEL_SOURCE)/modules.systemdlkm_blocklist.msm.kalama
+BOARD_VENDOR_KERNEL_MODULES_BLOCKLIST_FILE := $(TARGET_KERNEL_SOURCE)/modules.vendor_blocklist.msm.kalama
 BOARD_VENDOR_KERNEL_MODULES_LOAD := $(strip $(shell cat $(DEVICE_PATH)/modules.load))
 BOARD_VENDOR_RAMDISK_KERNEL_MODULES_BLOCKLIST_FILE := $(BOARD_VENDOR_KERNEL_MODULES_BLOCKLIST_FILE)
 BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD := $(strip $(shell cat $(DEVICE_PATH)/modules.load.vendor_boot))
diff --git a/modules.blocklist b/modules.blocklist
deleted file mode 100644
index 3929711..0000000
--- a/modules.blocklist
+++ /dev/null
@@ -1,64 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-# Copyright (c) 2020, The Linux Foundation. All rights reserved.
-blocklist 8250_of
-blocklist adc-tm
-blocklist atomic64_test
-blocklist can-bcm
-blocklist can-gw
-blocklist can-raw
-blocklist dummy-cpufreq
-blocklist dummy_hcd
-blocklist e4000
-blocklist failover
-blocklist fc0011
-blocklist fc0012
-blocklist fc0013
-blocklist fc2580
-blocklist it913x
-blocklist kheaders
-blocklist lkdtm
-blocklist llcc_perfmon
-blocklist locktorture
-blocklist m88rs6000t
-blocklist max2165
-blocklist mc44s803
-blocklist mmrm_test_module
-blocklist msi001
-blocklist mt2060
-blocklist mt2063
-blocklist mt20xx
-blocklist mt2131
-blocklist mt2266
-blocklist mxl301rf
-blocklist net_failover
-blocklist qm1d1b0004
-blocklist qm1d1c0042
-blocklist qt1010
-blocklist r820t
-blocklist rcutorture
-blocklist rtc-test
-blocklist si2157
-blocklist tda18212
-blocklist tda18218
-blocklist tda18250
-blocklist tda18271
-blocklist tda827x
-blocklist tda8290
-blocklist tda9887
-blocklist tea5761
-blocklist tea5767
-blocklist test_user_copy
-blocklist torture
-blocklist tua9001
-blocklist tuner-simple
-blocklist tuner-types
-blocklist tuner-xc2028
-blocklist vmw_vsock_virtio_transport
-blocklist vmw_vsock_virtio_transport_common
-blocklist vsock
-blocklist vsock_diag
-blocklist xc4000
-blocklist xc5000
-blocklist limits_stat
-blocklist limits_stress
-blocklist kunit