diff --git a/device-bluejay.mk b/device-bluejay.mk
index 0065197..e386161 100644
--- a/device-bluejay.mk
+++ b/device-bluejay.mk
@@ -27,23 +27,24 @@ $(call inherit-product-if-exists, vendor/google_devices/bluejay/proprietary/devi
 $(call inherit-product-if-exists, vendor/google_devices/bluejay/proprietary/bluejay/device-vendor-bluejay.mk)
 $(call inherit-product-if-exists, vendor/google_devices/bluejay/proprietary/WallpapersBluejay.mk)
 
-GOODIX_CONFIG_BUILD_VERSION := g7_trusty
 DEVICE_PACKAGE_OVERLAYS += device/google/bluejay/bluejay/overlay
 
 include device/google/gs101/fingerprint/extension/fingerprint.extension.mk
 include device/google/bluejay-sepolicy/bluejay-sepolicy.mk
 include device/google/bluejay/audio/bluejay/audio-tables.mk
 include device/google/gs101/device-shipping-common.mk
-include device/google/gs101/fingerprint/udfps_common.mk
 include device/google/gs101/telephony/pktrouter.mk
 include hardware/google/pixel/vibrator/cs40l26/device.mk
 include device/google/gs-common/bcmbt/bluetooth.mk
 include device/google/gs-common/touch/stm/stm11.mk
 
-ifeq ($(filter factory_bluejay, $(TARGET_PRODUCT)),)
-include device/google/gs101/fingerprint/udfps_shipping.mk
+# Fingerprint HAL
+GOODIX_CONFIG_BUILD_VERSION := g7_trusty
+include vendor/goodix/udfps/configuration/udfps_common.mk
+ifeq ($(filter factory%, $(TARGET_PRODUCT)),)
+include vendor/goodix/udfps/configuration/udfps_shipping.mk
 else
-include device/google/gs101/fingerprint/udfps_factory.mk
+include vendor/goodix/udfps/configuration/udfps_factory.mk
 endif
 
 # go/lyric-soong-variables