diff --git a/device-cheetah.mk b/device-cheetah.mk
index bb3e030..bf4bd53 100644
--- a/device-cheetah.mk
+++ b/device-cheetah.mk
@@ -283,7 +283,11 @@ PRODUCT_SOONG_NAMESPACES += \
     device/google/pantah
 
 # 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)
diff --git a/device-panther.mk b/device-panther.mk
index 091ce97..b4573aa 100644
--- a/device-panther.mk
+++ b/device-panther.mk
@@ -262,7 +262,11 @@ PRODUCT_SOONG_NAMESPACES += \
     device/google/pantah
 
 # 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)