diff --git a/audio/bluejay/config/mixer_paths_factory.xml b/audio/bluejay/config/mixer_paths_factory.xml
index 14b87bc..e68aa88 100644
--- a/audio/bluejay/config/mixer_paths_factory.xml
+++ b/audio/bluejay/config/mixer_paths_factory.xml
@@ -34,6 +34,14 @@
         <ctl name="EP1 TX Mixer TDM_0_TX" value="1" />
     </path>
 
+    <path name="mfg-record usb-headset-mic">
+        <ctl name="Audio Capture Mic Source" value="USB_MIC"/>
+        <ctl name="USB Capture FORMAT v2" value="1" />
+        <ctl name="USB Config To AoC v2" value="1"/>
+        <ctl name="EP1 TX Mixer USB_TX" value="1"/>
+        <ctl name="MIC Record Soft Gain (dB)" value="0" />
+    </path>
+
     <path name="mic1-status">
         <ctl name="MIC0" value="1" />
     </path>
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