diff --git a/common_prop.mk b/common_prop.mk
index 28117fbf..4d5707f9 100644
--- a/common_prop.mk
+++ b/common_prop.mk
@@ -243,19 +243,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
     ro.oem_unlock_supported=1
 
-# Perf
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.vendor.extension_library=libqti-perfd-client.so \
-    ro.vendor.qti.sys.fw.bg_apps_limit=60 \
-    ro.vendor.at_library=libqti-at.so \
-    vendor.enable.prefetch=0 \
-    vendor.iop.enable_iop=1 \
-    vendor.iop.enable_uxe=1 \
-    vendor.iop.enable_prefetch_ofr=0 \
-    vendor.perf.gestureflingboost.enable=true \
-    vendor.perf.iop_v3.enable=true \
-    vendor.perf.iop_v3.enable.debug=false
-
 # Proximity
 PRODUCT_PROPERTY_OVERRIDES += \
     gsm.proximity.enable=true
@@ -266,7 +253,8 @@ PRODUCT_PROPERTY_OVERRIDES += \
     persist.vendor.cne.feature=1 \
     persist.vendor.dpm.feature=1 \
     persist.vendor.dpm.nsrm.bkg.evt=3955 \
-    persist.vendor.qcomsysd.enabled=1
+    persist.vendor.qcomsysd.enabled=1 \
+    ro.vendor.extension_library=libqti-perfd-client.so
 
 # QTI
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
diff --git a/configs/perf/perfconfigstore.xml b/configs/perf/perfconfigstore.xml
index e878ac3e..ff8f4c34 100644
--- a/configs/perf/perfconfigstore.xml
+++ b/configs/perf/perfconfigstore.xml
@@ -18,15 +18,17 @@ property Name is called. -->
     <PerfConfigs>
 
                 <!--Vendor Properties -->
-                <Prop Name="vendor.iop.enable_uxe" Value="1" />
-                <Prop Name="vendor.perf.iop_v3.enable" Value="true" />
-                <Prop Name="vendor.perf.iop_v3.enable.debug" Value="false" />
-                <Prop Name="vendor.enable.prefetch" Value="false" />
-                <Prop Name="vendor.iop.enable_prefetch_ofr" Value="false" />
+                <Prop Name="vendor.iop.enable_iop" Value="0" />
+                <Prop Name="vendor.iop.enable_uxe" Value="0" />
+                <Prop Name="vendor.perf.iop_v3.enable" Value="0" />
+                <Prop Name="vendor.perf.iop_v3.enable.debug" Value="0" />
+                <Prop Name="vendor.enable.prefetch" Value="0" />
+                <Prop Name="vendor.iop.enable_prefetch_ofr" Value="0" />
 
                 <!--System Properties -->
                 <Prop Name="ro.vendor.qti.sys.fw.bg_apps_limit" Value="38" />
                 <Prop Name="ro.vendor.at_library" Value="libqti-at.so" />
+                <Prop Name="ro.lmk.enable_userspace_lmk" Value="false" />
                 <Prop Name="vendor.perf.gestureflingboost.enable" Value="true" />
 
     </PerfConfigs>