diff --git a/resources/templates/provision/yealink/w80/y000000000175.cfg b/resources/templates/provision/yealink/w80/y000000000175.cfg
index 973c85c10..8f9610644 100644
--- a/resources/templates/provision/yealink/w80/y000000000175.cfg
+++ b/resources/templates/provision/yealink/w80/y000000000175.cfg
@@ -15,15 +15,15 @@ static.network.secondary_dns = {$dns_server_secondary}
 
 static.network.static_nat.enable = {if isset($yealink_static_nat)}1{else}0{/if}
 static.network.static_nat.addr = {$yealink_static_nat}
-static.ice.enable =
-static.sip.nat_stun.enable =
-static.sip.nat_stun.port = {if isset($stun_port)}{$stun_port}{else}3478{/if}
-static.sip.nat_stun.server =
-static.sip.nat_turn.enable =
-static.sip.nat_turn.server =
-static.sip.nat_turn.port =
-static.sip.nat_turn.username =
-static.sip.nat_turn.password =
+static.ice.enable = {$yealink_ice_enable}
+static.sip.nat_stun.enable = {$yealink_stun_enable}
+static.sip.nat_stun.port = {$yealink_stun_port}
+static.sip.nat_stun.server = {$yealink_stun_server}
+static.sip.nat_turn.enable = {$yealink_turn_enable}
+static.sip.nat_turn.server = {$yealink_turn_server}
+static.sip.nat_turn.port = {$yealink_turn_port}
+static.sip.nat_turn.username = {$yealink_turn_username}
+static.sip.nat_turn.password = {$yealink_turn_password}
 
 static.network.lldp.enable = {$yealink_lldp_enable}
 static.network.lldp.packet_interval = {$yealink_lldp_packet_interval}
diff --git a/resources/templates/provision/yealink/w80/{$mac}.cfg b/resources/templates/provision/yealink/w80/{$mac}.cfg
index a1e58a9bf..e4d534133 100644
--- a/resources/templates/provision/yealink/w80/{$mac}.cfg
+++ b/resources/templates/provision/yealink/w80/{$mac}.cfg
@@ -77,39 +77,68 @@ account.{$row.line_number}.anonymous_reject_offcode =
 #######################################################################################
 ##                                   Codec                                           ##
 #######################################################################################
-account.{$row.line_number}.codec.g722.enable = {if isset($yealink_codec_g722_enable)}{$yealink_codec_g722_enable}{else}0{/if}
 
-account.{$row.line_number}.codec.g722.priority = {if isset($yealink_codec_g722_priority)}{$yealink_codec_g722_priority}{else}0{/if}
+account.{$row.line_number}.codec.ilbc_15_2kbps.priority= 0
+account.{$row.line_number}.codec.ilbc_15_2kbps.enable= 0
+account.{$row.line_number}.codec.ilbc_13_33kbps.priority= {if isset($yealink_codec_iLBC_priority)}{$yealink_codec_iLBC_priority}{else}0{/if}
 
-account.{$row.line_number}.codec.g729.enable = {if isset($yealink_codec_g729_enable) && $yealink_codec_g729_enable}1{else}0{/if}
-account.{$row.line_number}.codec.g729.priority = {if isset($yealink_codec_g729_priority)}{$yealink_codec_g729_priority}{else}0{/if}
+account.{$row.line_number}.codec.ilbc_13_33kbps.enable = {if isset($yealink_codec_ilbc_enable) && $yealink_codec_ilbc_enable}1{else}0{/if}
 
-account.{$row.line_number}.codec.g726_16.enable = {if isset($yealink_codec_g726_16_enable) && $yealink_codec_g726_16_enable}1{else}0{/if}
-account.{$row.line_number}.codec.g726_16.priority = {if isset($yealink_codec_g726_16_priority)}{$yealink_codec_g726_16_priority}{else}0{/if}
+account.{$row.line_number}.codec.pcma.enable= {if isset($yealink_codec_pcma_enable) && $yealink_codec_pcma_enable}1{else}{0}{/if}
 
-account.{$row.line_number}.codec.g726_24.enable = {if isset($yealink_codec_g726_24_enable) && $yealink_codec_g726_24_enable}1{else}0{/if}
-account.{$row.line_number}.codec.g726_24.priority = {if isset($yealink_codec_g726_24_priority)}{$yealink_codec_g726_24_priority}{else}0{/if}
+account.{$row.line_number}.codec.pcma.priority= {if isset($yealink_codec_pcma_priority)}{$yealink_codec_pcma_priority}{else}0{/if}
 
-account.{$row.line_number}.codec.g726_32.enable = {if isset($yealink_codec_g726_32_enable) && $yealink_codec_g726_32_enable}1{else}0{/if}
-account.{$row.line_number}.codec.g726_32.priority = {if isset($yealink_codec_g726_32_priority)}{$yealink_codec_g726_32_priority}{else}0{/if}
+account.{$row.line_number}.codec.pcmu.enable= {if isset($yealink_codec_pcmu_enable) && $yealink_codec_pcmu_enable}1{else}{0}{/if}
 
-account.{$row.line_number}.codec.g726_40.enable = {if isset($yealink_codec_g726_40_enable) && $yealink_codec_g726_40_enable}1{else}0{/if}
-account.{$row.line_number}.codec.g726_40.priority = {if isset($yealink_codec_g726_40_priority)}{$yealink_codec_g726_40_priority}{else}0{/if}
+account.{$row.line_number}.codec.pcmu.priority= {if isset($yealink_codec_pcmu_priority)}{$yealink_codec_pcmu_priority}{else}0{/if}
 
-account.{$row.line_number}.codec.ilbc.enable = {if isset($yealink_codec_ilbc_enable) && $yealink_codec_ilbc_enable}1{else}0{/if}
-account.{$row.line_number}.codec.ilbc.priority = {if isset($yealink_codec_iLBC_priority)}{$yealink_codec_iLBC_priority}{else}0{/if}
-
-account.{$row.line_number}.codec.pcmu.enable = {if isset($yealink_codec_pcmu_enable) && $yealink_codec_pcmu_enable}1{else}{0}{/if}
-account.{$row.line_number}.codec.pcmu.priority = {if isset($yealink_codec_pcmu_priority)}{$yealink_codec_pcmu_priority}{else}0{/if}
-
-account.{$row.line_number}.codec.pcma.enable = {if isset($yealink_codec_pcma_enable) && $yealink_codec_pcma_enable}1{else}{0}{/if}
-
-account.{$row.line_number}.codec.pcma.priority = {if isset($yealink_codec_pcma_priority)}{$yealink_codec_pcma_priority}{else}0{/if}
-
-
-account.{$row.line_number}.codec.opus.enable = {if isset($yealink_codec_opus_enable) && $yealink_codec_opus_enable}1{else}0{/if}
 account.{$row.line_number}.codec.opus.priority = {if isset($yealink_codec_opus_priority)}{$yealink_codec_opus_priority}{else}0{/if}
 
+account.{$row.line_number}.codec.opus.enable= {if isset($yealink_codec_opus_enable) && $yealink_codec_opus_enable}1{else}0{/if}
+
+account.{$row.line_number}.codec.opus.para=
+
+account.{$row.line_number}.codec.g726_40.enable= {if isset($yealink_codec_g726_40_enable) && $yealink_codec_g726_40_enable}1{else}0{/if}
+
+account.{$row.line_number}.codec.g726_40.priority= {if isset($yealink_codec_g726_40_priority)}{$yealink_codec_g726_40_priority}{else}0{/if}
+
+account.{$row.line_number}.codec.g726_32.enable= {if isset($yealink_codec_g726_32_enable) && $yealink_codec_g726_32_enable}1{else}0{/if}
+
+account.{$row.line_number}.codec.g726_32.priority= {if isset($yealink_codec_g726_32_priority)}{$yealink_codec_g726_32_priority}{else}0{/if}
+
+account.{$row.line_number}.codec.g726_24.enable= {if isset($yealink_codec_g726_24_enable) && $yealink_codec_g726_24_enable}1{else}0{/if}
+
+account.{$row.line_number}.codec.g726_24.priority= {if isset($yealink_codec_g726_24_priority)}{$yealink_codec_g726_24_priority}{else}0{/if}
+
+account.{$row.line_number}.codec.g726_16.enable= {if isset($yealink_codec_g726_16_enable) && $yealink_codec_g726_16_enable}1{else}0{/if}
+
+account.{$row.line_number}.codec.g726_16.priority= {if isset($yealink_codec_g726_16_priority)}{$yealink_codec_g726_16_priority}{else}0{/if}
+
+account.{$row.line_number}.codec.g723_63.priority= {if isset($yealink_codec_g723_63_priority)}{$yealink_codec_g723_63_priority}{else}0{/if}
+
+account.{$row.line_number}.codec.g723_63.enable= {if isset($yealink_codec_g723_63_enable) && $yealink_codec_g723_63_enable}1{else}0{/if}
+
+account.{$row.line_number}.codec.g723_53.priority= {if isset($yealink_codec_g723_53_priority)}{$yealink_codec_g723_53_priority}{else}0{/if}
+
+account.{$row.line_number}.codec.g723_53.enable= {if isset($yealink_codec_g723_53_enable) && $yealink_codec_g723_53_enable}1{else}{0}{/if}
+
+account.{$row.line_number}.codec.g729.priority= {if isset($yealink_codec_g729_priority)}{$yealink_codec_g729_priority}{else}0{/if}
+
+account.{$row.line_number}.codec.g729.enable= {if isset($yealink_codec_g729_enable) && $yealink_codec_g729_enable}1{else}0{/if}
+
+account.{$row.line_number}.codec.g722.priority= {if isset($yealink_codec_g722_priority)}{$yealink_codec_g722_priority}{else}0{/if}
+
+account.{$row.line_number}.codec.g722.enable= {if isset($yealink_codec_g722_enable) && $yealink_codec_g722_enable}1{else}0{/if}
+
+account.{$row.line_number}.codec.G722_1_24kpbs.priority=
+account.{$row.line_number}.codec.G722_1_24kpbs.enable=
+account.{$row.line_number}.codec.G722_1c_24kpbs.priority=
+account.{$row.line_number}.codec.G722_1c_24kpbs.enable=
+account.{$row.line_number}.codec.G722_1c_32kpbs.priority=
+account.{$row.line_number}.codec.G722_1c_32kpbs.enable=
+account.{$row.line_number}.codec.G722_1c_48kpbs.priority=
+account.{$row.line_number}.codec.G722_1c_48kpbs.enable=
+
 #######################################################################################
 ##                                   NAT Settings                                    ##
 #######################################################################################