diff --git a/audio/cheetah/tuning/waves/waves_config.ini b/audio/cheetah/tuning/waves/waves_config.ini
index 3e8c870..b9343d5 100644
--- a/audio/cheetah/tuning/waves/waves_config.ini
+++ b/audio/cheetah/tuning/waves/waves_config.ini
@@ -6,7 +6,6 @@
 ########################################################################################################
 [HAL_SUPPORTED_FEATURES]
 CUSTOM_ACTION_258=1
-# Action 258 parameters: [dev, mode, throttle control state]
 
 ########################################################################################################
 # This defined the options of supported sample rates.
@@ -20,20 +19,17 @@ SR_COMMON   = 48000
 # This can be configured by Waves or platform vendor.
 ########################################################################################################
 [HAL_ORIENTATION_SUBTYPES]
-OST_SPEAKER = 0:12,90:13,180:12,270:0|13
+OST_SPEAKER = 0:12,90:13,180:12,270:14
 
 ########################################################################################################
 # This defines available preset configurations.
 # This should be configured by Waves only unless platform vendor is familiar with MPS structure.
 ########################################################################################################
 [HAL_SUPPORTED_PRESETS]
-SPEAKER_MUSIC_THROTTLE= OM:1,SM:2,OST:OST_SPEAKER
-SPEAKER_SAFE_MUSIC_THROTTLE = OM:10,SM:2,OST:OST_SPEAKER
-SPEAKER_SAFE_CALL_THROTTLE = OM:10,SM:2,OST:OST_SPEAKER
+SPEAKER_MUSIC_THROTTLE= OM:1,SM:3,OST:OST_SPEAKER
+SPEAKER_SAFE_MUSIC_THROTTLE = OM:10,SM:3,OST:OST_SPEAKER
 SPEAKER_MUSIC = OM:1,SM:2,OST:OST_SPEAKER
 SPEAKER_SAFE_MUSIC = OM:10,SM:2,OST:OST_SPEAKER
-SPEAKER_SAFE_CALL = OM:10,SM:2,OST:OST_SPEAKER
-HEADSET_MUSIC = OM:2,SM:2
 
 ########################################################################################################
 # This defines available CONTROL configurations. Only define the CONTROL if you need it.
@@ -41,9 +37,7 @@ HEADSET_MUSIC = OM:2,SM:2
 # This can be configured by Waves or platform vendor.
 ########################################################################################################
 [HAL_SUPPORTED_CONTROLS]
-SPEAKER_INSTANCE = INSTANCE:1,DEV:0,SR:SR_COMMON,PRESET:SPEAKER_MUSIC|SPEAKER_SAFE_MUSIC|SPEAKER_SAFE_CALL|SPEAKER_MUSIC_THROTTLE|SPEAKER_SAFE_MUSIC_THROTTLE|SPEAKER_SAFE_CALL_THROTTLE
-A2DP_INSTANCE = INSTANCE:2,DEV:0,SR:SR_COMMON,PRESET:HEADSET_MUSIC
-USB_HEADPHONE_INSTANCE = INSTANCE:4,DEV:0,SR:SR_COMMON,PRESET:HEADSET_MUSIC
+SPEAKER_INSTANCE = INSTANCE:1,DEV:0,SR:SR_COMMON,PRESET:SPEAKER_MUSIC|SPEAKER_SAFE_MUSIC|SPEAKER_MUSIC_THROTTLE|SPEAKER_SAFE_MUSIC_THROTTLE
 
 [COEFS_CONVERTER_SETTING]
 AlgFxPath=/vendor/lib/libAlgFx_HiFi3z.so
@@ -58,8 +52,10 @@ AlgFxPath64=/vendor/lib64/libAlgFx_HiFi3z.so
 
 [CUSTOM_ACTION_258]
 CASE_1=PRIORITY:0,NUMBERS:2:0|1:1|2,PRESET:SPEAKER_MUSIC
-CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4:1|2,PRESET:SPEAKER_SAFE_CALL
+CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4:1|2,PRESET:SPEAKER_SAFE_MUSIC
 CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1:1|2,PRESET:SPEAKER_SAFE_MUSIC
 CASE_4=PRIORITY:3,NUMBERS:2:0|1:0,PRESET:SPEAKER_MUSIC_THROTTLE
-CASE_5=PRIORITY:4,NUMBERS:1|2|4194304:2|3|4:0,PRESET:SPEAKER_SAFE_CALL_THROTTLE
+CASE_5=PRIORITY:4,NUMBERS:1|2|4194304:2|3|4:0,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE
 CASE_6=PRIORITY:5,NUMBERS:1|4194304:0|1:0,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE
+# Action 258 parameters:  audio_devices_t, audio_mode_t, throttle_control_state_t
+# - throttle_control_state_t: 0 - Enabled, 1 - Disabled, 2 - Bypassed
diff --git a/audio/cheetah/tuning/waves/waves_preset.mps b/audio/cheetah/tuning/waves/waves_preset.mps
index bd08ee3..e8383b9 100644
Binary files a/audio/cheetah/tuning/waves/waves_preset.mps and b/audio/cheetah/tuning/waves/waves_preset.mps differ
diff --git a/audio/panther/tuning/waves/waves_config.ini b/audio/panther/tuning/waves/waves_config.ini
index 3e8c870..b9343d5 100644
--- a/audio/panther/tuning/waves/waves_config.ini
+++ b/audio/panther/tuning/waves/waves_config.ini
@@ -6,7 +6,6 @@
 ########################################################################################################
 [HAL_SUPPORTED_FEATURES]
 CUSTOM_ACTION_258=1
-# Action 258 parameters: [dev, mode, throttle control state]
 
 ########################################################################################################
 # This defined the options of supported sample rates.
@@ -20,20 +19,17 @@ SR_COMMON   = 48000
 # This can be configured by Waves or platform vendor.
 ########################################################################################################
 [HAL_ORIENTATION_SUBTYPES]
-OST_SPEAKER = 0:12,90:13,180:12,270:0|13
+OST_SPEAKER = 0:12,90:13,180:12,270:14
 
 ########################################################################################################
 # This defines available preset configurations.
 # This should be configured by Waves only unless platform vendor is familiar with MPS structure.
 ########################################################################################################
 [HAL_SUPPORTED_PRESETS]
-SPEAKER_MUSIC_THROTTLE= OM:1,SM:2,OST:OST_SPEAKER
-SPEAKER_SAFE_MUSIC_THROTTLE = OM:10,SM:2,OST:OST_SPEAKER
-SPEAKER_SAFE_CALL_THROTTLE = OM:10,SM:2,OST:OST_SPEAKER
+SPEAKER_MUSIC_THROTTLE= OM:1,SM:3,OST:OST_SPEAKER
+SPEAKER_SAFE_MUSIC_THROTTLE = OM:10,SM:3,OST:OST_SPEAKER
 SPEAKER_MUSIC = OM:1,SM:2,OST:OST_SPEAKER
 SPEAKER_SAFE_MUSIC = OM:10,SM:2,OST:OST_SPEAKER
-SPEAKER_SAFE_CALL = OM:10,SM:2,OST:OST_SPEAKER
-HEADSET_MUSIC = OM:2,SM:2
 
 ########################################################################################################
 # This defines available CONTROL configurations. Only define the CONTROL if you need it.
@@ -41,9 +37,7 @@ HEADSET_MUSIC = OM:2,SM:2
 # This can be configured by Waves or platform vendor.
 ########################################################################################################
 [HAL_SUPPORTED_CONTROLS]
-SPEAKER_INSTANCE = INSTANCE:1,DEV:0,SR:SR_COMMON,PRESET:SPEAKER_MUSIC|SPEAKER_SAFE_MUSIC|SPEAKER_SAFE_CALL|SPEAKER_MUSIC_THROTTLE|SPEAKER_SAFE_MUSIC_THROTTLE|SPEAKER_SAFE_CALL_THROTTLE
-A2DP_INSTANCE = INSTANCE:2,DEV:0,SR:SR_COMMON,PRESET:HEADSET_MUSIC
-USB_HEADPHONE_INSTANCE = INSTANCE:4,DEV:0,SR:SR_COMMON,PRESET:HEADSET_MUSIC
+SPEAKER_INSTANCE = INSTANCE:1,DEV:0,SR:SR_COMMON,PRESET:SPEAKER_MUSIC|SPEAKER_SAFE_MUSIC|SPEAKER_MUSIC_THROTTLE|SPEAKER_SAFE_MUSIC_THROTTLE
 
 [COEFS_CONVERTER_SETTING]
 AlgFxPath=/vendor/lib/libAlgFx_HiFi3z.so
@@ -58,8 +52,10 @@ AlgFxPath64=/vendor/lib64/libAlgFx_HiFi3z.so
 
 [CUSTOM_ACTION_258]
 CASE_1=PRIORITY:0,NUMBERS:2:0|1:1|2,PRESET:SPEAKER_MUSIC
-CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4:1|2,PRESET:SPEAKER_SAFE_CALL
+CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4:1|2,PRESET:SPEAKER_SAFE_MUSIC
 CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1:1|2,PRESET:SPEAKER_SAFE_MUSIC
 CASE_4=PRIORITY:3,NUMBERS:2:0|1:0,PRESET:SPEAKER_MUSIC_THROTTLE
-CASE_5=PRIORITY:4,NUMBERS:1|2|4194304:2|3|4:0,PRESET:SPEAKER_SAFE_CALL_THROTTLE
+CASE_5=PRIORITY:4,NUMBERS:1|2|4194304:2|3|4:0,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE
 CASE_6=PRIORITY:5,NUMBERS:1|4194304:0|1:0,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE
+# Action 258 parameters:  audio_devices_t, audio_mode_t, throttle_control_state_t
+# - throttle_control_state_t: 0 - Enabled, 1 - Disabled, 2 - Bypassed
diff --git a/audio/panther/tuning/waves/waves_preset.mps b/audio/panther/tuning/waves/waves_preset.mps
index 9e46393..673f34e 100644
Binary files a/audio/panther/tuning/waves/waves_preset.mps and b/audio/panther/tuning/waves/waves_preset.mps differ