diff --git a/overlay/FrameworksResTarget_Vendor/res/values/config.xml b/overlay/FrameworksResTarget_Vendor/res/values/config.xml
index 1f627f1..12a9301 100644
--- a/overlay/FrameworksResTarget_Vendor/res/values/config.xml
+++ b/overlay/FrameworksResTarget_Vendor/res/values/config.xml
@@ -4,26 +4,6 @@
      SPDX-License-Identifier: Apache-2.0
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- Note: This config is deprecated, use BluetoothProperties instead.
-         Idle current for bluetooth controller. 0 by default
-    -->
-    <integer name="config_bluetooth_idle_cur_ma" translatable="false">6</integer>
-
-    <!-- Note: This config is deprecated, use BluetoothProperties instead.
-         Rx current for bluetooth controller. 0 by default
-    -->
-    <integer name="config_bluetooth_rx_cur_ma" translatable="false">28</integer>
-
-    <!-- Note: This config is deprecated, use BluetoothProperties instead.
-         Tx current for bluetooth controller. 0 by default
-    -->
-    <integer name="config_bluetooth_tx_cur_ma" translatable="false">36</integer>
-
-    <!-- Note: This config is deprecated, use BluetoothProperties instead.
-         Operating volatage for bluetooth controller. 0 by default
-    -->
-    <integer name="config_bluetooth_operating_voltage_mv" translatable="false">3700</integer>
-
     <!-- Whether a software navigation bar should be shown. NOTE: in the future this may be
          autodetected from the Configuration. -->
     <bool name="config_showNavigationBar">true</bool>
diff --git a/properties/product.prop b/properties/product.prop
index 12f2b28..f316418 100644
--- a/properties/product.prop
+++ b/properties/product.prop
@@ -27,6 +27,10 @@ vendor.audio_hal.period_size=192
 vendor.voice.path.for.pcm.voip=true
 
 # Bluetooth
+bluetooth.hardware.power.idle_cur_ma=6
+bluetooth.hardware.power.operating_voltage_mv=3700
+bluetooth.hardware.power.rx_cur_ma=28
+bluetooth.hardware.power.tx_cur_ma=36
 bluetooth.profile.a2dp.source.enabled=true
 bluetooth.profile.asha.central.enabled=true
 bluetooth.profile.avrcp.controller.enabled=false