diff --git a/common_prop.mk b/common_prop.mk
index 8b874be2..c4833489 100644
--- a/common_prop.mk
+++ b/common_prop.mk
@@ -1,6 +1,3 @@
-#Build FP to be picked by both system and vendor
-BUILD_FINGERPRINT := "xiaomi/wayne/wayne:8.1.0/OPM1.171019.011/V9.5.11.0.ODCCNFA:user/release-keys"
-
 # Apex
 ifeq ($(ENABLE_APEX), true)
 PRODUCT_PRODUCT_PROPERTIES += \
diff --git a/init/init_sdm660.cpp b/init/init_sdm660.cpp
index c938706c..faa8acd6 100644
--- a/init/init_sdm660.cpp
+++ b/init/init_sdm660.cpp
@@ -119,6 +119,9 @@ void vendor_load_persist_properties()
 }
 void vendor_load_properties()
 {
+  property_override("ro.build.description", "xiaomi/wayne/wayne:8.1.0/OPM1.171019.011/V9.5.11.0.ODCCNFA:user/release-keys");
+  property_override_dual("ro.build.fingerprint", "ro.vendor.build.fingerprint", "xiaomi/wayne/wayne:8.1.0/OPM1.171019.011/V9.5.11.0.ODCCNFA:user/release-keys");
+  
    std::string product = GetProperty("ro.product.vendor.device", "");	
    if (product.find("whyred") != std::string::npos)
    {