diff --git a/conf/init.bluejay.rc b/conf/init.bluejay.rc
index cbaefeb..fbe19c6 100644
--- a/conf/init.bluejay.rc
+++ b/conf/init.bluejay.rc
@@ -21,3 +21,9 @@ on post-fs-data
 # Ensure Camera sound is enforced audible for JP SKU
 on property:ro.boot.hardware.sku=GB17L
     setprop audio.camerasound.force true
+
+# charger driver exposes now finer grain control, map demo mode to those properties
+# NOTE: demo mode can only be exit wiping data (which reset the persist properties)
+on property:sys.retaildemo.enabled=1
+    setprop persist.vendor.charge.stop.level 35
+    setprop persist.vendor.charge.start.level 30