diff --git a/device-bluejay.mk b/device-bluejay.mk
index 33cb592..00be01d 100644
--- a/device-bluejay.mk
+++ b/device-bluejay.mk
@@ -41,7 +41,11 @@ include device/google/gs-common/bcmbt/bluetooth.mk
 include device/google/gs-common/touch/stm/stm11.mk
 
 # Fingerprint HAL
+ifneq (,$(filter AP4%,$(RELEASE_PLATFORM_VERSION)))
+GOODIX_CONFIG_BUILD_VERSION := g7_trusty_next
+else
 GOODIX_CONFIG_BUILD_VERSION := g7_trusty
+endif
 $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk)
 ifeq ($(filter factory%, $(TARGET_PRODUCT)),)
 $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk)