diff --git a/bluetooth_power_limits_raven.csv b/bluetooth_power_limits_raven.csv
index 0f4196b..eeed54f 100644
--- a/bluetooth_power_limits_raven.csv
+++ b/bluetooth_power_limits_raven.csv
@@ -1,34 +1,34 @@
 Head,BTHotspot,WIFI5Ghz,HotspotVoice,Cell,IMU,BDR_Single_Chain_0,EDR_Single_Chain_0,BLE_Single_Chain_0,BDR_Single_Chain_1,EDR_Single_Chain_1,BLE_Single_Chain_1,BDR_Dual_Chain_0,EDR_Dual_Chain_0,BLE_Dual_Chain_0,BDR_Dual_Chain_1,EDR_Dual_Chain_1,BLE_Dual_Chain_1
-off,off,off,off,off,on,60,60,44,60,60,44,48,48,44,48,48,44
-off,off,off,off,on,on,60,60,44,60,60,44,48,48,44,48,48,44
-off,off,off,on,off,on,60,60,44,60,60,44,48,48,44,48,48,44
-off,off,off,on,on,on,60,60,44,60,60,44,48,48,44,48,48,44
-off,off,on,off,off,on,60,60,44,60,60,44,48,48,44,48,48,44
-off,off,on,off,on,on,60,60,44,60,60,44,48,48,44,48,48,44
-off,off,on,on,off,on,60,60,44,60,60,44,48,48,44,48,48,44
-off,off,on,on,on,on,60,60,44,60,60,44,48,48,44,48,48,44
-off,on,off,off,off,on,60,60,44,60,60,44,48,48,44,48,48,44
-off,on,off,off,on,on,60,60,44,60,60,44,48,48,44,48,48,44
-off,on,off,on,off,on,60,60,44,60,60,44,48,48,44,48,48,44
-off,on,off,on,on,on,60,60,44,60,60,44,48,48,44,48,48,44
-off,on,on,off,off,on,60,60,44,60,60,44,48,48,44,48,48,44
-off,on,on,off,on,on,60,60,44,60,60,44,48,48,44,48,48,44
-off,on,on,on,off,on,60,60,44,60,60,44,48,48,44,48,48,44
-off,on,on,on,on,on,60,60,44,60,60,44,48,48,44,48,48,44
-on,off,off,off,off,any,60,60,44,60,60,44,48,48,44,48,48,44
-on,off,off,off,on,any,60,60,44,60,60,44,48,48,44,48,48,44
-on,off,off,on,off,any,60,60,44,60,60,44,48,48,44,48,48,44
-on,off,off,on,on,any,60,60,44,60,60,44,48,48,44,48,48,44
-on,off,on,off,off,any,60,60,44,60,60,44,48,48,44,48,48,44
-on,off,on,off,on,any,60,60,44,60,60,44,48,48,44,48,48,44
-on,off,on,on,off,any,60,60,44,60,60,44,48,48,44,48,48,44
-on,off,on,on,on,any,60,60,44,60,60,44,48,48,44,48,48,44
-on,on,off,off,off,any,60,60,44,60,60,44,48,48,44,48,48,44
-on,on,off,off,on,any,60,60,44,60,60,44,48,48,44,48,48,44
-on,on,off,on,off,any,60,60,44,60,60,44,48,48,44,48,48,44
-on,on,off,on,on,any,60,60,44,60,60,44,48,48,44,48,48,44
-on,on,on,off,off,any,60,60,44,60,60,44,48,48,44,48,48,44
-on,on,on,off,on,any,60,60,44,60,60,44,48,48,44,48,48,44
-on,on,on,on,off,any,60,60,44,60,60,44,48,48,44,48,48,44
-on,on,on,on,on,any,60,60,44,60,60,44,48,48,44,48,48,44
-off,any,any,any,any,off,60,60,44,60,60,44,48,48,44,48,48,44
+off,off,off,off,off,on,68,64,40,68,64,40,52,52,40,52,52,40
+off,off,off,off,on,on,68,64,40,68,64,40,52,52,40,52,52,40
+off,off,off,on,off,on,68,64,40,68,64,40,52,52,40,52,52,40
+off,off,off,on,on,on,68,64,40,68,64,40,52,52,40,52,52,40
+off,off,on,off,off,on,68,64,40,68,64,40,52,52,40,52,52,40
+off,off,on,off,on,on,68,64,40,68,64,40,52,52,40,52,52,40
+off,off,on,on,off,on,68,64,40,68,64,40,52,52,40,52,52,40
+off,off,on,on,on,on,68,64,40,68,64,40,52,52,40,52,52,40
+off,on,off,off,off,on,68,64,40,68,64,40,52,52,40,52,52,40
+off,on,off,off,on,on,68,64,40,68,64,40,52,52,40,52,52,40
+off,on,off,on,off,on,68,64,40,68,64,40,52,52,40,52,52,40
+off,on,off,on,on,on,68,64,40,68,64,40,52,52,40,52,52,40
+off,on,on,off,off,on,68,64,40,68,64,40,52,52,40,52,52,40
+off,on,on,off,on,on,68,64,40,68,64,40,52,52,40,52,52,40
+off,on,on,on,off,on,68,64,40,68,64,40,52,52,40,52,52,40
+off,on,on,on,on,on,68,64,40,68,64,40,52,52,40,52,52,40
+on,off,off,off,off,any,68,64,40,68,64,40,52,52,40,52,52,40
+on,off,off,off,on,any,68,64,40,68,64,40,52,52,40,52,52,40
+on,off,off,on,off,any,68,64,40,68,64,40,52,52,40,52,52,40
+on,off,off,on,on,any,68,64,40,68,64,40,52,52,40,52,52,40
+on,off,on,off,off,any,68,64,40,68,64,40,52,52,40,52,52,40
+on,off,on,off,on,any,68,64,40,68,64,40,52,52,40,52,52,40
+on,off,on,on,off,any,44,44,40,44,44,40,44,44,40,44,44,40
+on,off,on,on,on,any,44,44,40,44,44,40,44,44,40,44,44,40
+on,on,off,off,off,any,44,44,40,44,44,40,44,44,40,44,44,40
+on,on,off,off,on,any,44,44,40,44,44,40,44,44,40,44,44,40
+on,on,off,on,off,any,44,44,40,44,44,40,44,44,40,44,44,40
+on,on,off,on,on,any,44,44,40,44,44,40,44,44,40,44,44,40
+on,on,on,off,off,any,44,44,40,44,44,40,44,44,40,44,44,40
+on,on,on,off,on,any,44,44,40,44,44,40,44,44,40,44,44,40
+on,on,on,on,off,any,44,44,40,44,44,40,44,44,40,44,44,40
+on,on,on,on,on,any,44,44,40,44,44,40,44,44,40,44,44,40
+off,any,any,any,any,off,68,64,40,68,64,40,52,56,40,52,56,40
\ No newline at end of file
diff --git a/bluetooth_power_limits_EU.csv b/bluetooth_power_limits_raven_eu.csv
similarity index 100%
rename from bluetooth_power_limits_EU.csv
rename to bluetooth_power_limits_raven_eu.csv
diff --git a/bluetooth_power_limits_raven_jp.csv b/bluetooth_power_limits_raven_jp.csv
new file mode 100644
index 0000000..f87f85b
--- /dev/null
+++ b/bluetooth_power_limits_raven_jp.csv
@@ -0,0 +1,34 @@
+Head,BTHotspot,WIFI5Ghz,HotspotVoice,Cell,IMU,BDR_Single_Chain_0,EDR_Single_Chain_0,BLE_Single_Chain_0,BDR_Single_Chain_1,EDR_Single_Chain_1,BLE_Single_Chain_1,BDR_Dual_Chain_0,EDR_Dual_Chain_0,BLE_Dual_Chain_0,BDR_Dual_Chain_1,EDR_Dual_Chain_1,BLE_Dual_Chain_1
+off,off,off,off,off,on,68,64,40,68,64,40,52,56,40,52,56,40
+off,off,off,off,on,on,68,64,40,68,64,40,52,56,40,52,56,40
+off,off,off,on,off,on,68,64,40,68,64,40,52,56,40,52,56,40
+off,off,off,on,on,on,68,64,40,68,64,40,52,56,40,52,56,40
+off,off,on,off,off,on,68,64,40,68,64,40,52,56,40,52,56,40
+off,off,on,off,on,on,68,64,40,68,64,40,52,56,40,52,56,40
+off,off,on,on,off,on,68,64,40,68,64,40,52,56,40,52,56,40
+off,off,on,on,on,on,68,64,40,68,64,40,52,56,40,52,56,40
+off,on,off,off,off,on,68,64,40,68,64,40,52,56,40,52,56,40
+off,on,off,off,on,on,68,64,40,68,64,40,52,56,40,52,56,40
+off,on,off,on,off,on,68,64,40,68,64,40,52,56,40,52,56,40
+off,on,off,on,on,on,68,64,40,68,64,40,52,56,40,52,56,40
+off,on,on,off,off,on,68,64,40,68,64,40,52,56,40,52,56,40
+off,on,on,off,on,on,68,64,40,68,64,40,52,56,40,52,56,40
+off,on,on,on,off,on,68,64,40,68,64,40,52,56,40,52,56,40
+off,on,on,on,on,on,68,64,40,68,64,40,52,56,40,52,56,40
+on,off,off,off,off,any,68,64,40,68,64,40,52,56,40,52,56,40
+on,off,off,off,on,any,68,64,40,68,64,40,52,56,40,52,56,40
+on,off,off,on,off,any,68,64,40,68,64,40,52,56,40,52,56,40
+on,off,off,on,on,any,68,64,40,68,64,40,52,56,40,52,56,40
+on,off,on,off,off,any,68,64,40,68,64,40,52,56,40,52,56,40
+on,off,on,off,on,any,68,64,40,68,64,40,52,56,40,52,56,40
+on,off,on,on,off,any,68,64,40,68,64,40,52,56,40,52,56,40
+on,off,on,on,on,any,68,64,40,68,64,40,52,56,40,52,56,40
+on,on,off,off,off,any,68,64,40,68,64,40,52,56,40,52,56,40
+on,on,off,off,on,any,68,64,40,68,64,40,52,56,40,52,56,40
+on,on,off,on,off,any,68,64,40,68,64,40,52,56,40,52,56,40
+on,on,off,on,on,any,68,64,40,68,64,40,52,56,40,52,56,40
+on,on,on,off,off,any,68,64,40,68,64,40,52,56,40,52,56,40
+on,on,on,off,on,any,68,64,40,68,64,40,52,56,40,52,56,40
+on,on,on,on,off,any,68,64,40,68,64,40,52,56,40,52,56,40
+on,on,on,on,on,any,68,64,40,68,64,40,52,56,40,52,56,40
+off,any,any,any,any,off,68,64,40,68,64,40,52,56,40,52,56,40
\ No newline at end of file
diff --git a/bluetooth_power_limits_US.csv b/bluetooth_power_limits_raven_us.csv
similarity index 100%
rename from bluetooth_power_limits_US.csv
rename to bluetooth_power_limits_raven_us.csv
diff --git a/device-raven.mk b/device-raven.mk
index 5d688db..db26652 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -69,8 +69,10 @@ PRODUCT_PRODUCT_PROPERTIES += \
 # Bluetooth Tx power caps for raven
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/bluetooth_power_limits_raven.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv \
-    $(LOCAL_PATH)/bluetooth_power_limits_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_US.csv \
-    $(LOCAL_PATH)/bluetooth_power_limits_EU.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_EU.csv
+    $(LOCAL_PATH)/bluetooth_power_limits_raven_us.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_US.csv \
+    $(LOCAL_PATH)/bluetooth_power_limits_raven_eu.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_EU.csv \
+    $(LOCAL_PATH)/bluetooth_power_limits_raven_jp.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_JP.csv
+
 
 # Bluetooth SAR test tool
 PRODUCT_PACKAGES_DEBUG += \