diff --git a/qcom/opensource/dataipa/drivers/platform/msm/Kbuild b/qcom/opensource/dataipa/drivers/platform/msm/Kbuild
index 527d15a43f..0bc9a805c2 100644
--- a/qcom/opensource/dataipa/drivers/platform/msm/Kbuild
+++ b/qcom/opensource/dataipa/drivers/platform/msm/Kbuild
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-only
-DATAIPADRVTOP = $(srctree)/techpack/dataipa/drivers/platform/msm
+DATAIPADRVTOP = $(srctree)/$(src)
 
 #MSMs - GKI
 ifeq ($(CONFIG_ARCH_LAHAINA), y)
@@ -17,22 +17,20 @@ endif
 
 #MSM - Vendor SI
 ifeq ($(filter $(CONFIG_ARCH_WAIPIO) $(CONFIG_ARCH_KALAMA) $(CONFIG_ARCH_PINEAPPLE) $(CONFIG_ARCH_CLIFFS) $(CONFIG_ARCH_PARROT), y),y)
-DATAIPADRVTOP = $(srctree)/../../vendor/qcom/opensource/dataipa/drivers/platform/msm
-LINUXINCLUDE    += -include $(srctree)/../../vendor/qcom/opensource/dataipa/config/dataipa_vendor.h
-include $(srctree)/../../vendor/qcom/opensource/dataipa/config/dataipa_GKI.conf
+LINUXINCLUDE    += -include $(DATAIPADRVTOP)/../../../config/dataipa_vendor.h
+include $(DATAIPADRVTOP)/../../../config/dataipa_GKI.conf
 ifeq ($(CONFIG_LOCALVERSION), "-gki-consolidate")
-include $(srctree)/../../vendor/qcom/opensource/dataipa/config/dataipa_GKI_consolidate.conf
-LINUXINCLUDE    += -include $(srctree)/../../vendor/qcom/opensource/dataipa/config/dataipa_debug.h
+include $(DATAIPADRVTOP)/../../../config/dataipa_GKI_consolidate.conf
+LINUXINCLUDE    += -include $(DATAIPADRVTOP)/../../../config/dataipa_debug.h
 endif
 endif
 
 ifeq ($(filter $(CONFIG_ARCH_KHAJE) $(CONFIG_ARCH_BLAIR) $(CONFIG_ARCH_HOLI) $(CONFIG_ARCH_MONACO), y), y)
-DATAIPADRVTOP = $(srctree)/../../vendor/qcom/opensource/dataipa/drivers/platform/msm
-LINUXINCLUDE    += -include $(srctree)/../../vendor/qcom/opensource/dataipa/config/dataipa_vendor_ipav4.h
-include $(srctree)/../../vendor/qcom/opensource/dataipa/config/dataipa_GKI_ipav4.conf
+LINUXINCLUDE    += -include $(DATAIPADRVTOP)/../../../config/dataipa_vendor_ipav4.h
+include $(DATAIPADRVTOP)/../../../config/dataipa_GKI_ipav4.conf
 ifeq ($(CONFIG_LOCALVERSION), "-gki-consolidate")
-include $(srctree)/../../vendor/qcom/opensource/dataipa/config/dataipa_GKI_consolidate.conf
-LINUXINCLUDE    += -include $(srctree)/../../vendor/qcom/opensource/dataipa/config/dataipa_debug.h
+include $(DATAIPADRVTOP)/../../../config/dataipa_GKI_consolidate.conf
+LINUXINCLUDE    += -include $(DATAIPADRVTOP)/../../../config/dataipa_debug.h
 endif
 endif