diff --git a/app/yealink/app_config.php b/app/yealink/app_config.php
index 16240b1033..5212f337e1 100644
--- a/app/yealink/app_config.php
+++ b/app/yealink/app_config.php
@@ -1738,5 +1738,13 @@
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = "0";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Enable or Disable the WiFi adapter. Options: 0-Disabled, 1-Enabled";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "e01400ea-ef55-4da1-aa09-3be3001f6932";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_force_voice_ring_volume";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Forced ringer volume: 0 - 15, default: empty";
 
 ?>
diff --git a/resources/templates/provision/yealink/t33g/y000000000124.cfg b/resources/templates/provision/yealink/t33g/y000000000124.cfg
index b752b2892f..cbe3c4461d 100644
--- a/resources/templates/provision/yealink/t33g/y000000000124.cfg
+++ b/resources/templates/provision/yealink/t33g/y000000000124.cfg
@@ -453,13 +453,14 @@ features.anonymous_response_code=
 ##                          Call Configuration                                       ##       
 #######################################################################################
 phone_setting.incoming_call_when_dialing.priority=
-phone_setting.hold_or_swap.mode=
+phone_setting.hold_or_swap.mode = {if isset($yealink_hold_or_swap_mode)}{$yealink_hold_or_swap_mode}{else}0{/if}
+
 features.play_held_tone.interval=
 features.play_held_tone.delay=
 features.play_held_tone.enable=
 features.play_hold_tone.interval=
 features.ignore_incoming_call.enable=
-force.voice.ring_vol=
+force.voice.ring_vol = {$yealink_force_voice_ring_volume}
 features.mute.autoanswer_mute.enable=
 features.play_hold_tone.delay =
 phone_setting.end_call_net_disconnect.enable =
diff --git a/resources/templates/provision/yealink/t34w/y000000000171.cfg b/resources/templates/provision/yealink/t34w/y000000000171.cfg
index 6952a43cc2..3b915896df 100644
--- a/resources/templates/provision/yealink/t34w/y000000000171.cfg
+++ b/resources/templates/provision/yealink/t34w/y000000000171.cfg
@@ -448,13 +448,14 @@ features.anonymous_response_code =
 ##                          Call Configuration                                       ##
 #######################################################################################
 phone_setting.incoming_call_when_dialing.priority =
-phone_setting.hold_or_swap.mode =
+phone_setting.hold_or_swap.mode = {if isset($yealink_hold_or_swap_mode)}{$yealink_hold_or_swap_mode}{else}0{/if}
+
 features.play_held_tone.interval =
 features.play_held_tone.delay =
 features.play_held_tone.enable =
 features.play_hold_tone.interval =
 features.ignore_incoming_call.enable =
-force.voice.ring_vol =
+force.voice.ring_vol = {$yealink_force_voice_ring_volume}
 features.mute.autoanswer_mute.enable =
 features.play_hold_tone.delay =
 phone_setting.end_call_net_disconnect.enable =
diff --git a/resources/templates/provision/yealink/t41s/y000000000068.cfg b/resources/templates/provision/yealink/t41s/y000000000068.cfg
index ef5f836658..4ac7d384fc 100644
--- a/resources/templates/provision/yealink/t41s/y000000000068.cfg
+++ b/resources/templates/provision/yealink/t41s/y000000000068.cfg
@@ -414,13 +414,14 @@ features.anonymous_response_code=
 ##                          Call Configuration                                       ##
 #######################################################################################
 phone_setting.incoming_call_when_dialing.priority=
-phone_setting.hold_or_swap.mode=
+phone_setting.hold_or_swap.mode = {if isset($yealink_hold_or_swap_mode)}{$yealink_hold_or_swap_mode}{else}0{/if}
+
 features.play_held_tone.interval=
 features.play_held_tone.delay=
 features.play_held_tone.enable=
 features.play_hold_tone.interval=
 features.ignore_incoming_call.enable=
-force.voice.ring_vol=
+force.voice.ring_vol = {$yealink_force_voice_ring_volume}
 features.mute.autoanswer_mute.enable=
 features.play_hold_tone.delay =
 phone_setting.end_call_net_disconnect.enable =
diff --git a/resources/templates/provision/yealink/t42s/y000000000067.cfg b/resources/templates/provision/yealink/t42s/y000000000067.cfg
index 45ba6f99d8..24d0cf2345 100644
--- a/resources/templates/provision/yealink/t42s/y000000000067.cfg
+++ b/resources/templates/provision/yealink/t42s/y000000000067.cfg
@@ -421,14 +421,14 @@ features.anonymous_response_code=
 ##                          Call Configuration                                       ##
 #######################################################################################
 phone_setting.incoming_call_when_dialing.priority=
-{if isset($yealink_hold_or_swap_mode)}phone_setting.hold_or_swap.mode = {$yealink_hold_or_swap_mode}{else}phone_setting.hold_or_swap.mode = 0{/if}
+phone_setting.hold_or_swap.mode = {if isset($yealink_hold_or_swap_mode)}{$yealink_hold_or_swap_mode}{else}0{/if}
 
 features.play_held_tone.interval=
 features.play_held_tone.delay=
 features.play_held_tone.enable=
 features.play_hold_tone.interval=
 features.ignore_incoming_call.enable=
-force.voice.ring_vol=
+force.voice.ring_vol = {$yealink_force_voice_ring_volume}
 features.mute.autoanswer_mute.enable=
 features.play_hold_tone.delay =
 phone_setting.end_call_net_disconnect.enable =
diff --git a/resources/templates/provision/yealink/t43u/y000000000107.cfg b/resources/templates/provision/yealink/t43u/y000000000107.cfg
index a37f40414e..edb242682d 100644
--- a/resources/templates/provision/yealink/t43u/y000000000107.cfg
+++ b/resources/templates/provision/yealink/t43u/y000000000107.cfg
@@ -457,13 +457,14 @@ features.anonymous_response_code=
 ##                          Call Configuration                                       ##
 #######################################################################################
 phone_setting.incoming_call_when_dialing.priority=
-phone_setting.hold_or_swap.mode=
+phone_setting.hold_or_swap.mode = {if isset($yealink_hold_or_swap_mode)}{$yealink_hold_or_swap_mode}{else}0{/if}
+
 features.play_held_tone.interval=
 features.play_held_tone.delay=
 features.play_held_tone.enable=
 features.play_hold_tone.interval=
 features.ignore_incoming_call.enable=
-force.voice.ring_vol=
+force.voice.ring_vol = {$yealink_force_voice_ring_volume}
 features.mute.autoanswer_mute.enable=
 features.play_hold_tone.delay =
 phone_setting.end_call_net_disconnect.enable =
diff --git a/resources/templates/provision/yealink/t44w/y000000000174.cfg b/resources/templates/provision/yealink/t44w/y000000000174.cfg
index 1657aaf112..dc5a04a86e 100644
--- a/resources/templates/provision/yealink/t44w/y000000000174.cfg
+++ b/resources/templates/provision/yealink/t44w/y000000000174.cfg
@@ -448,13 +448,14 @@ features.anonymous_response_code =
 ##                          Call Configuration                                       ##
 #######################################################################################
 phone_setting.incoming_call_when_dialing.priority =
-phone_setting.hold_or_swap.mode =
+phone_setting.hold_or_swap.mode = {if isset($yealink_hold_or_swap_mode)}{$yealink_hold_or_swap_mode}{else}0{/if}
+
 features.play_held_tone.interval =
 features.play_held_tone.delay =
 features.play_held_tone.enable =
 features.play_hold_tone.interval =
 features.ignore_incoming_call.enable =
-force.voice.ring_vol =
+force.voice.ring_vol = {$yealink_force_voice_ring_volume}
 features.mute.autoanswer_mute.enable =
 features.play_hold_tone.delay =
 phone_setting.end_call_net_disconnect.enable =
diff --git a/resources/templates/provision/yealink/t46s/y000000000066.cfg b/resources/templates/provision/yealink/t46s/y000000000066.cfg
index 385cff7030..a7746f704a 100644
--- a/resources/templates/provision/yealink/t46s/y000000000066.cfg
+++ b/resources/templates/provision/yealink/t46s/y000000000066.cfg
@@ -411,14 +411,14 @@ features.anonymous_response_code=
 ##                          Call Configuration                                       ##
 #######################################################################################
 phone_setting.incoming_call_when_dialing.priority=
-{if isset($yealink_hold_or_swap_mode)}phone_setting.hold_or_swap.mode = {$yealink_hold_or_swap_mode}{else}phone_setting.hold_or_swap.mode = 0{/if}
+phone_setting.hold_or_swap.mode = {if isset($yealink_hold_or_swap_mode)}{$yealink_hold_or_swap_mode}{else}0{/if}
 
 features.play_held_tone.interval=
 features.play_held_tone.delay=
 features.play_held_tone.enable=
 features.play_hold_tone.interval=
 features.ignore_incoming_call.enable=
-force.voice.ring_vol=
+force.voice.ring_vol = {$yealink_force_voice_ring_volume}
 features.mute.autoanswer_mute.enable=
 features.play_hold_tone.delay =
 phone_setting.end_call_net_disconnect.enable =
diff --git a/resources/templates/provision/yealink/t46u/y000000000108.cfg b/resources/templates/provision/yealink/t46u/y000000000108.cfg
index 758d4afd2b..30f8e014b3 100644
--- a/resources/templates/provision/yealink/t46u/y000000000108.cfg
+++ b/resources/templates/provision/yealink/t46u/y000000000108.cfg
@@ -448,13 +448,14 @@ features.anonymous_response_code=
 ##                          Call Configuration                                       ##
 #######################################################################################
 phone_setting.incoming_call_when_dialing.priority=
-phone_setting.hold_or_swap.mode=
+phone_setting.hold_or_swap.mode = {if isset($yealink_hold_or_swap_mode)}{$yealink_hold_or_swap_mode}{else}0{/if}
+
 features.play_held_tone.interval=
 features.play_held_tone.delay=
 features.play_held_tone.enable=
 features.play_hold_tone.interval=
 features.ignore_incoming_call.enable=
-force.voice.ring_vol=
+force.voice.ring_vol = {$yealink_force_voice_ring_volume}
 features.mute.autoanswer_mute.enable=
 features.play_hold_tone.delay =
 phone_setting.end_call_net_disconnect.enable =
diff --git a/resources/templates/provision/yealink/t48s/y000000000065.cfg b/resources/templates/provision/yealink/t48s/y000000000065.cfg
index 4bf277a828..ff968f392a 100644
--- a/resources/templates/provision/yealink/t48s/y000000000065.cfg
+++ b/resources/templates/provision/yealink/t48s/y000000000065.cfg
@@ -454,14 +454,14 @@ features.anonymous_response_code=
 ##                          Call Configuration                                       ##
 #######################################################################################
 phone_setting.incoming_call_when_dialing.priority=
-{if isset($yealink_hold_or_swap_mode)}phone_setting.hold_or_swap.mode = {$yealink_hold_or_swap_mode}{else}phone_setting.hold_or_swap.mode = 0{/if}
+phone_setting.hold_or_swap.mode = {if isset($yealink_hold_or_swap_mode)}{$yealink_hold_or_swap_mode}{else}0{/if}
 
 features.play_held_tone.interval=
 features.play_held_tone.delay=
 features.play_held_tone.enable=
 features.play_hold_tone.interval=
 features.ignore_incoming_call.enable=
-force.voice.ring_vol=
+force.voice.ring_vol = {$yealink_force_voice_ring_volume}
 features.mute.autoanswer_mute.enable=
 features.play_hold_tone.delay =
 phone_setting.end_call_net_disconnect.enable =
diff --git a/resources/templates/provision/yealink/t52s/y000000000074.cfg b/resources/templates/provision/yealink/t52s/y000000000074.cfg
index 99e35915da..672b27555a 100644
--- a/resources/templates/provision/yealink/t52s/y000000000074.cfg
+++ b/resources/templates/provision/yealink/t52s/y000000000074.cfg
@@ -421,13 +421,14 @@ features.anonymous_response_code=
 ##                          Call Configuration                                       ##
 #######################################################################################
 phone_setting.incoming_call_when_dialing.priority =
-phone_setting.hold_or_swap.mode =
+phone_setting.hold_or_swap.mode = {if isset($yealink_hold_or_swap_mode)}{$yealink_hold_or_swap_mode}{else}0{/if}
+
 features.play_held_tone.interval =
 features.play_held_tone.delay =
 features.play_held_tone.enable =
 features.play_hold_tone.interval =
 features.ignore_incoming_call.enable =
-force.voice.ring_vol =
+force.voice.ring_vol = {$yealink_force_voice_ring_volume}
 features.mute.autoanswer_mute.enable =
 features.play_hold_tone.delay =
 phone_setting.end_call_net_disconnect.enable =
diff --git a/resources/templates/provision/yealink/t53/y000000000095.cfg b/resources/templates/provision/yealink/t53/y000000000095.cfg
index 092776d43e..d0dac2755e 100644
--- a/resources/templates/provision/yealink/t53/y000000000095.cfg
+++ b/resources/templates/provision/yealink/t53/y000000000095.cfg
@@ -446,14 +446,14 @@ features.anonymous_response_code=
 ##                          Call Configuration                                       ##       
 #######################################################################################
 phone_setting.incoming_call_when_dialing.priority=
-{if isset($yealink_hold_or_swap_mode)}phone_setting.hold_or_swap.mode = {$yealink_hold_or_swap_mode}{else}phone_setting.hold_or_swap.mode = 0{/if}
+phone_setting.hold_or_swap.mode = {if isset($yealink_hold_or_swap_mode)}{$yealink_hold_or_swap_mode}{else}0{/if}
 
 features.play_held_tone.interval =
 features.play_held_tone.delay =
 features.play_held_tone.enable =
 features.play_hold_tone.interval =
 features.ignore_incoming_call.enable =
-force.voice.ring_vol =
+force.voice.ring_vol = {$yealink_force_voice_ring_volume}
 features.mute.autoanswer_mute.enable =
 features.play_hold_tone.delay =
 phone_setting.end_call_net_disconnect.enable =
diff --git a/resources/templates/provision/yealink/t53w/y000000000095.cfg b/resources/templates/provision/yealink/t53w/y000000000095.cfg
index 147d6b8340..43534d673f 100644
--- a/resources/templates/provision/yealink/t53w/y000000000095.cfg
+++ b/resources/templates/provision/yealink/t53w/y000000000095.cfg
@@ -447,14 +447,14 @@ features.anonymous_response_code=
 ##                          Call Configuration                                       ##       
 #######################################################################################
 phone_setting.incoming_call_when_dialing.priority=
-{if isset($yealink_hold_or_swap_mode)}phone_setting.hold_or_swap.mode = {$yealink_hold_or_swap_mode}{else}phone_setting.hold_or_swap.mode = 0{/if}
+phone_setting.hold_or_swap.mode = {if isset($yealink_hold_or_swap_mode)}{$yealink_hold_or_swap_mode}{else}0{/if}
 
 features.play_held_tone.interval =
 features.play_held_tone.delay =
 features.play_held_tone.enable =
 features.play_hold_tone.interval =
 features.ignore_incoming_call.enable =
-force.voice.ring_vol =
+force.voice.ring_vol = {$yealink_force_voice_ring_volume}
 features.mute.autoanswer_mute.enable =
 features.play_hold_tone.delay =
 phone_setting.end_call_net_disconnect.enable =
diff --git a/resources/templates/provision/yealink/t54s/y000000000070.cfg b/resources/templates/provision/yealink/t54s/y000000000070.cfg
index faaeb51d29..0ddb8e5c1a 100644
--- a/resources/templates/provision/yealink/t54s/y000000000070.cfg
+++ b/resources/templates/provision/yealink/t54s/y000000000070.cfg
@@ -420,13 +420,14 @@ features.anonymous_response_code=
 ##                          Call Configuration                                       ##
 #######################################################################################
 phone_setting.incoming_call_when_dialing.priority =
-phone_setting.hold_or_swap.mode =
+phone_setting.hold_or_swap.mode = {if isset($yealink_hold_or_swap_mode)}{$yealink_hold_or_swap_mode}{else}0{/if}
+
 features.play_held_tone.interval =
 features.play_held_tone.delay =
 features.play_held_tone.enable =
 features.play_hold_tone.interval =
 features.ignore_incoming_call.enable =
-force.voice.ring_vol =
+force.voice.ring_vol = {$yealink_force_voice_ring_volume}
 features.mute.autoanswer_mute.enable =
 features.play_hold_tone.delay =
 phone_setting.end_call_net_disconnect.enable =
diff --git a/resources/templates/provision/yealink/t54w/y000000000096.cfg b/resources/templates/provision/yealink/t54w/y000000000096.cfg
index 8f26a63d5f..f99574b5ab 100644
--- a/resources/templates/provision/yealink/t54w/y000000000096.cfg
+++ b/resources/templates/provision/yealink/t54w/y000000000096.cfg
@@ -446,14 +446,14 @@ features.anonymous_response_code=
 ##                          Call Configuration                                       ##       
 #######################################################################################
 phone_setting.incoming_call_when_dialing.priority=
-{if isset($yealink_hold_or_swap_mode)}phone_setting.hold_or_swap.mode = {$yealink_hold_or_swap_mode}{else}phone_setting.hold_or_swap.mode = 0{/if}
+phone_setting.hold_or_swap.mode = {if isset($yealink_hold_or_swap_mode)}{$yealink_hold_or_swap_mode}{else}0{/if}
 
 features.play_held_tone.interval =
 features.play_held_tone.delay =
 features.play_held_tone.enable =
 features.play_hold_tone.interval =
 features.ignore_incoming_call.enable =
-force.voice.ring_vol =
+force.voice.ring_vol = {$yealink_force_voice_ring_volume}
 features.mute.autoanswer_mute.enable =
 features.play_hold_tone.delay =
 phone_setting.end_call_net_disconnect.enable =
diff --git a/resources/templates/provision/yealink/t57w/y000000000097.cfg b/resources/templates/provision/yealink/t57w/y000000000097.cfg
index 7603a7ceaf..4f6addfc30 100644
--- a/resources/templates/provision/yealink/t57w/y000000000097.cfg
+++ b/resources/templates/provision/yealink/t57w/y000000000097.cfg
@@ -445,14 +445,14 @@ features.anonymous_response_code=
 ##                          Call Configuration                                       ##       
 #######################################################################################
 phone_setting.incoming_call_when_dialing.priority=
-{if isset($yealink_hold_or_swap_mode)}phone_setting.hold_or_swap.mode = {$yealink_hold_or_swap_mode}{else}phone_setting.hold_or_swap.mode = 0{/if}
+phone_setting.hold_or_swap.mode = {if isset($yealink_hold_or_swap_mode)}{$yealink_hold_or_swap_mode}{else}0{/if}
 
 features.play_held_tone.interval =
 features.play_held_tone.delay =
 features.play_held_tone.enable =
 features.play_hold_tone.interval =
 features.ignore_incoming_call.enable =
-force.voice.ring_vol =
+force.voice.ring_vol = {$yealink_force_voice_ring_volume}
 features.mute.autoanswer_mute.enable =
 features.play_hold_tone.delay =
 phone_setting.end_call_net_disconnect.enable =
diff --git a/resources/templates/provision/yealink/t58w/y000000000150.cfg b/resources/templates/provision/yealink/t58w/y000000000150.cfg
index cdc33e62bc..f3e25382ef 100644
--- a/resources/templates/provision/yealink/t58w/y000000000150.cfg
+++ b/resources/templates/provision/yealink/t58w/y000000000150.cfg
@@ -2331,12 +2331,13 @@ features.speaker_mode.enable=
 features.station_name.scrolling_display=
 features.station_name.value =
 features.transfer_keep_session2_after_failed.enable=
-force.voice.ring_vol=
+force.voice.ring_vol = {$yealink_force_voice_ring_volume}
 
 phone_setting.incoming_call.horizontal_roll_interval=
 phone_setting.incoming_call.reject.enable=
 phone_setting.incoming_call_when_dialing.priority=
-{if isset($yealink_hold_or_swap_mode)}phone_setting.hold_or_swap.mode = {$yealink_hold_or_swap_mode}{else}phone_setting.hold_or_swap.mode = 0{/if}
+phone_setting.hold_or_swap.mode = {if isset($yealink_hold_or_swap_mode)}{$yealink_hold_or_swap_mode}{else}0{/if}
+
 phone_setting.call_appearance.calls_per_linekey=
 phone_setting.call_appearance.conference_via_new_linekey=
 phone_setting.call_appearance.transfer_via_new_linekey={$yealink_transfer_via_new_linekey}