diff --git a/fingerprint/fpc1540/fingerprint_aidl_config.mk b/fingerprint/fpc1540/sw33/fingerprint_aidl_config.mk
similarity index 100%
rename from fingerprint/fpc1540/fingerprint_aidl_config.mk
rename to fingerprint/fpc1540/sw33/fingerprint_aidl_config.mk
diff --git a/fingerprint/fpc1540/fingerprint_hidl_config_factory.mk b/fingerprint/fpc1540/sw33/fingerprint_hidl_config_factory.mk
similarity index 100%
rename from fingerprint/fpc1540/fingerprint_hidl_config_factory.mk
rename to fingerprint/fpc1540/sw33/fingerprint_hidl_config_factory.mk
diff --git a/fingerprint/fpc1540/fpc1540.mk b/fingerprint/fpc1540/sw33/fpc1540.mk
similarity index 84%
rename from fingerprint/fpc1540/fpc1540.mk
rename to fingerprint/fpc1540/sw33/fpc1540.mk
index adf0275b..7aff143a 100644
--- a/fingerprint/fpc1540/fpc1540.mk
+++ b/fingerprint/fpc1540/sw33/fpc1540.mk
@@ -1,6 +1,6 @@
 # Factory build, use HIDL hal & extension so that we can use Test tool
 ifneq ( ,$(findstring factory, $(TARGET_PRODUCT)))
-include device/google/gs101/fingerprint/fpc1540/fingerprint_hidl_config_factory.mk
+include device/google/gs101/fingerprint/fpc1540/sw33/fingerprint_hidl_config_factory.mk
 PRODUCT_PACKAGES += \
     android.hardware.biometrics.fingerprint@2.1-service.fpc \
     fpc_tee_test\
@@ -18,7 +18,7 @@ PRODUCT_COPY_FILES += \
 
 else
 # Non facotry build, use fingerprint AIDL version
-include device/google/gs101/fingerprint/fpc1540/fingerprint_aidl_config.mk
+include device/google/gs101/fingerprint/fpc1540/sw33/fingerprint_aidl_config.mk
 
 PRODUCT_PACKAGES += \
     android.hardware.biometrics.fingerprint-service.fpc \