diff --git a/common.mk b/common.mk
index 6bb4f9ba..f9beab2f 100644
--- a/common.mk
+++ b/common.mk
@@ -158,11 +158,11 @@ PRODUCT_COPY_FILES += \
 
 # Memory Optimizations
 PRODUCT_PROPERTY_OVERRIDES += \
-    ro.vendor.qti.sys.fw.bg_apps_limit=10 \
     ro.vendor.qti.am.reschedule_service=true \
-    ro.vendor.qti.sys.fw.bservice_enable=true \
-    ro.vendor.qti.sys.fw.bservice_age=5000 \
-    ro.vendor.qti.sys.fw.bservice_limit=10
+    ro.vendor.qti.sys.fw.use_trim_settings=true \
+    ro.vendor.qti.sys.fw.trim_empty_percent=50 \
+    ro.vendor.qti.sys.fw.trim_cache_percent=100 \
+    ro.vendor.qti.sys.fw.empty_app_percent=2
 
 PRODUCT_PACKAGES += \
     SamsungDoze