diff --git a/resources/templates/provision/yealink/t32g/{$mac}.cfg b/resources/templates/provision/yealink/t32g/{$mac}.cfg
index ba36f8260b..133d4cff29 100644
--- a/resources/templates/provision/yealink/t32g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t32g/{$mac}.cfg
@@ -7,49 +7,49 @@
 #######################################################################################
 
 #Enable or disable the account 1; 0-Disabled (default), 1-Enabled;
-{if isset($user_password_1) }
+{if isset($account.1.user_password) }
 account.1.enable = 1
 {else}
 account.1.enable = 0
 {/if}
 
 #Configure the label displayed on the LCD screen for account 1.
-account.1.label = {$display_name_1}
+account.1.label = {$account.1.display_name}
 
 #Configure the display name of account 1.
-account.1.display_name = {$display_name_1}
+account.1.display_name = {$account.1.display_name}
 
 #Configure the username and password for register authentication.
-account.1.auth_name = {$auth_id_1}
-account.1.password = {$user_password_1}
+account.1.auth_name = {$account.1.auth_id}
+account.1.password = {$account.1.password}
 
 #Configure the register user name.
-account.1.user_name = {$user_id_1}
+account.1.user_name = {$account.1.user_id}
 
 #Enable or disable the phone to receive the messages from the server only; 0-Disabled (default), 1-Enabled;
 account.1.sip_trust_ctrl = 1
 
 #Configure the SIP server address.
-account.1.sip_server_host = {$server_address_1}
+account.1.sip_server_host = {$account.1.server_address}
 
 #Specify the port for the SIP server. The default value is 5060.
-account.1.sip_server_port = {$sip_port_1}
+account.1.sip_server_port = {$account.1.sip_port}
 
 #Enable or disable the use of the outbound proxy server; 0-Disabled (default), 1-Enabled;
 account.1.outbound_proxy_enable = {if isset($outbound_proxy_primary_1)}1{else}0{/if}
 
 #Specify the IP address or domain name of the outbound proxy server.
-account.1.outbound_host = {$outbound_proxy_primary_1}
+account.1.outbound_host = {$account.1.outbound_proxy_primary}
 
 #Specify the server port, the default value is 5060.
-account.1.outbound_port = {$sip_port_1}
+account.1.outbound_port = {$account.1.sip_port}
 {if isset($yealink_sip_listen_port)}account.1.sip_listen_port = {$yealink_sip_listen_port}{else}account.1.sip_listen_port = 5060{/if}
 
 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
-{if $sip_transport_1 == 'udp'}account.1.transport = 0{/if}
-{if $sip_transport_1 == 'tcp'}account.1.transport = 1{/if}
-{if $sip_transport_1 == 'tls'}account.1.transport = 2{/if}
-{if $sip_transport_1 == 'dns srv'}account.1.transport = 3{/if}
+{if $account.1.sip_transport == 'udp'}account.1.transport = 0{/if}
+{if $account.1.sip_transport == 'tcp'}account.1.transport = 1{/if}
+{if $account.1.sip_transport == 'tls'}account.1.transport = 2{/if}
+{if $account.1.sip_transport == 'dns srv'}account.1.transport = 3{/if}
 
 
 #Configure the address of the backup outbound proxy server.
@@ -59,7 +59,7 @@ account.1.backup_outbound_host = {$outbound_proxy_secondary_1}
 {if isset($outbound_proxy_1_port)}
 account.1.backup_outbound_port = $outbound_proxy_secondary_1
 {else}
-account.1.backup_outbound_port = 5060
+account.1.backup_outbound_port = {$account.1.sip_port}
 {/if}
 
 #Configure the voice mail number of account 1.
@@ -75,9 +75,9 @@ account.1.srv_ttl_timer_enable =
 #Configure the type of DNS-SRV query; 0-UDP, TCP and TLS (default), 1-UDP, 2-TCP, 3-TLS;
 #Require reboot;
 
-{if $sip_transport_1 == 'udp'}account.1.dns_srv_type = 0{/if}
-{if $sip_transport_1 == 'tcp'}account.1.dns_srv_type = 2{/if}
-{if $sip_transport_1 == 'tls'}account.1.dns_srv_type = 3{/if}
+{if $account.1.sip_transport == 'udp'}account.1.dns_srv_type = 0{/if}
+{if $account.1.sip_transport == 'tcp'}account.1.dns_srv_type = 2{/if}
+{if $account.1.sip_transport == 'tls'}account.1.dns_srv_type = 3{/if}
 
 
 #Enable or disable the anonymous call feature; 0-Disabled (default), 1-Enabled;
@@ -98,7 +98,7 @@ account.1.anonymous_reject_offcode =
 account.1.sip_listen_port =
 
 #Configure the register expiry time (in seconds), the default value is 3600.
-account.1.expires = {$register_expires_1}
+account.1.expires = {$account.1.register_expires}
 
 #Enable or disable the 100 reliable retransmission; 0-Disabled, 1-Enabled (default);
 account.1.100rel_enable = {$yealink_retransmission}