diff --git a/device-bluejay.mk b/device-bluejay.mk
index e386161..0c141de 100644
--- a/device-bluejay.mk
+++ b/device-bluejay.mk
@@ -40,11 +40,11 @@ include device/google/gs-common/touch/stm/stm11.mk
 
 # Fingerprint HAL
 GOODIX_CONFIG_BUILD_VERSION := g7_trusty
-include vendor/goodix/udfps/configuration/udfps_common.mk
+$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk)
 ifeq ($(filter factory%, $(TARGET_PRODUCT)),)
-include vendor/goodix/udfps/configuration/udfps_shipping.mk
+$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk)
 else
-include vendor/goodix/udfps/configuration/udfps_factory.mk
+$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_factory.mk)
 endif
 
 # go/lyric-soong-variables