diff --git a/components.mk b/components.mk
index 3f962975..637a9f56 100644
--- a/components.mk
+++ b/components.mk
@@ -79,7 +79,7 @@ ifneq (,$(filter dsprpcd, $(TARGET_COMMON_QTI_COMPONENTS)))
   include $(QCOM_COMMON_PATH)/vendor/dsprpcd/qti-dsprpcd.mk
 endif
 
-ifeq ($(call is-board-platform-in-list,$(5_10_FAMILY)),true)
+ifeq ($(call is-board-platform-in-list,$(5_10_FAMILY) $(5_15_FAMILY)),true)
   include $(QCOM_COMMON_PATH)/dlkm/qti-dlkm.mk
 endif
 
@@ -131,7 +131,7 @@ ifneq (,$(filter perf, $(TARGET_COMMON_QTI_COMPONENTS)))
 endif
 
 ifneq (,$(filter qseecomd, $(TARGET_COMMON_QTI_COMPONENTS)))
-  ifeq ($(call is-board-platform-in-list,$(5_4_FAMILY) $(5_10_FAMILY)),true)
+  ifeq ($(call is-board-platform-in-list,$(5_4_FAMILY) $(5_10_FAMILY) $(5_15_FAMILY)),true)
     TARGET_QSEECOMD_COMPONENT_VARIANT ?= qseecomd
   else
     TARGET_QSEECOMD_COMPONENT_VARIANT ?= qseecomd-legacy
diff --git a/vendor/perf/qti-perf.mk b/vendor/perf/qti-perf.mk
index 152ae86b..0f39d87a 100644
--- a/vendor/perf/qti-perf.mk
+++ b/vendor/perf/qti-perf.mk
@@ -57,12 +57,12 @@ PRODUCT_VENDOR_PROPERTIES += \
     ro.vendor.qspm.enable=true \
     vendor.power.pasr.enabled=true
 
-ifeq ($(call is-board-platform-in-list, kalama),true)
+ifeq ($(TARGET_KERNEL_VERSION),5.15)
 PRODUCT_VENDOR_PROPERTIES += \
     vendor.perf.framepacing.enable=1
 endif
 
-ifeq ($(call is-board-platform-in-list, kalama kona lahaina parrot taro),true)
+ifneq (,$(filter 5.10 5.15, $(TARGET_KERNEL_VERSION)))
 PRODUCT_VENDOR_PROPERTIES += \
     ro.vendor.beluga.p=0x3 \
     ro.vendor.beluga.c=0x4800 \
diff --git a/vendor/telephony/qti-telephony.mk b/vendor/telephony/qti-telephony.mk
index 711ac7b4..7004c8f7 100644
--- a/vendor/telephony/qti-telephony.mk
+++ b/vendor/telephony/qti-telephony.mk
@@ -19,7 +19,7 @@ PRODUCT_SOONG_NAMESPACES += \
 $(call inherit-product, vendor/qcom/opensource/dataservices/dataservices_vendor_product.mk)
 
 # IPACM
-ifneq (,$(filter 5.10, $(TARGET_KERNEL_VERSION)))
+ifneq (,$(filter 5.10 5.15, $(TARGET_KERNEL_VERSION)))
 PRODUCT_SOONG_NAMESPACES += vendor/qcom/opensource/data-ipa-cfg-mgr
 $(call inherit-product, vendor/qcom/opensource/data-ipa-cfg-mgr/ipacm_vendor_product.mk)
 else
diff --git a/vendor/usb/qti-usb.mk b/vendor/usb/qti-usb.mk
index 97d96b13..b51d0ec6 100644
--- a/vendor/usb/qti-usb.mk
+++ b/vendor/usb/qti-usb.mk
@@ -18,11 +18,11 @@ PRODUCT_SOONG_NAMESPACES += \
 # Inherit from the USB product definition.
 $(call inherit-product, vendor/qcom/opensource/usb/vendor_product.mk)
 
-ifneq (,$(filter 5.4 5.10, $(TARGET_KERNEL_VERSION)))
+ifneq (,$(filter 5.4 5.10 5.15, $(TARGET_KERNEL_VERSION)))
 TARGET_HAS_DIAG_ROUTER := true
 endif
 
-ifeq (,$(filter 4.19 5.4 5.10, $(TARGET_KERNEL_VERSION)))
+ifeq (,$(filter 4.19 5.4 5.10 5.15, $(TARGET_KERNEL_VERSION)))
 PRODUCT_PACKAGES += android.hardware.usb@1.0-service
 endif