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