diff --git a/device-felix.mk b/device-felix.mk
index ed62cdd..1ade952 100644
--- a/device-felix.mk
+++ b/device-felix.mk
@@ -184,6 +184,8 @@ ACTUATOR_MODEL := luxshare_ict_lt_xlra1906d
 # Fingerprint
 include device/google/gs101/fingerprint/fpc1540/sw42/fpc1540.mk
 FPC_MODULE_TYPE=1542_C
+# Fingerprint config
+include device/google/felix/fingerprint_config.mk
 
 # DCK properties based on target
 PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/fingerprint_config.mk b/fingerprint_config.mk
new file mode 100644
index 0000000..fd21645
--- /dev/null
+++ b/fingerprint_config.mk
@@ -0,0 +1,7 @@
+# Factory build, use HIDL hal & extension so that we can use Test tool
+ifneq ( ,$(findstring factory, $(TARGET_PRODUCT)))
+GOOGLE_CONFIG_FP_STATUS=1
+FPC_CONFIG_TRUSTY_CLEAN_TA=1
+else
+# Non factory build, use fingerprint AIDL version
+endif