diff --git a/config/partner_gms.mk b/config/partner_gms.mk
index 5be7551065..bb516ecdb1 100644
--- a/config/partner_gms.mk
+++ b/config/partner_gms.mk
@@ -1,3 +1,7 @@
 ifeq ($(WITH_GMS),true)
+ifeq ($(WITH_GMS_FI),true)
+$(call inherit-product-if-exists, vendor/partner_gms/products/fi.mk)
+else
 $(call inherit-product-if-exists, vendor/partner_gms/products/gms.mk)
 endif
+endif