diff --git a/resources/templates/provision/htek/uc903/{$mac}.cfg b/resources/templates/provision/htek/uc903/{$mac}.cfg
index d5405c5410..bfd71515fc 100644
--- a/resources/templates/provision/htek/uc903/{$mac}.cfg
+++ b/resources/templates/provision/htek/uc903/{$mac}.cfg
@@ -3,19 +3,19 @@
     <config version="1">
         <!--Account1/Basic-->
         <P271 para="Account1.Active">1</P271>
-        <P47 para="Account1.Sipserver">{$server_address_1}</P47>
+        <P47 para="Account1.Sipserver">{$account.1.server_address}</P47>
         <P967 para="Account1.FailoverSipserver" />
         <P8851 para="Account1.SecondFailoverSipserver" />
         <P4567 para="Account1.PreferPrimaryServer">0</P4567>
-        <P48 para="Account1.OutboundProxy">{$outbound_proxy_primary_1}</P48>
-        <P20047 para="Account1.BackUpOutboundProxy">{$outbound_proxy_secondary_1}</P20047>
+        <P48 para="Account1.OutboundProxy">{$account.1.outbound_proxy_primary}</P48>
+        <P20047 para="Account1.BackUpOutboundProxy">{$account.1.outbound_proxy_secondary}</P20047>
         <P130 para="Account1.SipTransport">{$htek_transport}</P130>
         <P52 para="Account1.NatTraversal">2</P52>
-        <P20000 para="Account1.Lable">{$display_name_1}</P20000>
-        <P35 para="Account1.SipUserId">{$user_id_1}</P35>
-        <P36 para="Account1.AuthenticateID">{$auth_id_1}</P36>
-        <P34 para="Account1.AuthenticatePassword">{$user_password_1}</P34>
-        <P3 para="Account1.DispalyName">{$display_name_1}</P3>
+        <P20000 para="Account1.Lable">{$account.1.display_name}</P20000>
+        <P35 para="Account1.SipUserId">{$account.1.user_id}</P35>
+        <P36 para="Account1.AuthenticateID">{$account.1.auth_id}</P36>
+        <P34 para="Account1.AuthenticatePassword">{$account.1.user_password}</P34>
+        <P3 para="Account1.DispalyName">{$account.1.display_name}</P3>
         <P103 para="Account1.DnsMode">{$htek_dns_mode}</P103>
         <P63 para="Account1.UserIdIsPhoneNumber">0</P63>
         <P31 para="Account1.SipRegistration">1</P31>
@@ -132,19 +132,19 @@
         <P20976 para="Account1.SCABargeIn">0</P20976>
         <!--Account2/Basic-->
         <P401 para="Account2.Active">1</P401>
-        <P747 para="Account2.Sipserver">{$server_address_2}</P747>
+        <P747 para="Account2.Sipserver">{$account.2.server_address}</P747>
         <P987 para="Account2.FailoverSipserver" />
         <P8852 para="Account2.SecondFailoverSipserver" />
         <P4568 para="Account2.PreferPrimaryServer">0</P4568>
-        <P748 para="Account2.OutboundProxy">{$outbound_proxy_primary_2}</P748>
-        <P20048 para="Account2.BackUpOutboundProxy">{$outbound_proxy_secondary_2}</P20048>
+        <P748 para="Account2.OutboundProxy">{$account.2.outbound_proxy_primary}</P748>
+        <P20048 para="Account2.BackUpOutboundProxy">{$account.2.outbound_proxy_secondary}</P20048>
         <P830 para="Account2.SipTransport">{$htek_transport}</P830>
         <P730 para="Account2.NatTraversal">2</P730>
-        <P20001 para="Account2.Lable">{$display_name_2}</P20001>
-        <P735 para="Account2.SipUserId">{$user_id_2}</P735>
-        <P736 para="Account2.AuthenticateID">{$auth_id_2}</P736>
-        <P734 para="Account2.AuthenticatePassword">{$user_password_2}</P734>
-        <P703 para="Account2.DispalyName">{$display_name_2}</P703>
+        <P20001 para="Account2.Lable">{$account.2.display_name}</P20001>
+        <P735 para="Account2.SipUserId">{$account.2.user_id}</P735>
+        <P736 para="Account2.AuthenticateID">{$account.2.auth_id}</P736>
+        <P734 para="Account2.AuthenticatePassword">{$account.2.user_password}</P734>
+        <P703 para="Account2.DispalyName">{$account.2.display_name}</P703>
         <P702 para="Account2.DnsMode">0</P702>
         <P763 para="Account2.UserIdIsPhoneNumber">0</P763>
         <P731 para="Account2.SipRegistration">1</P731>
@@ -261,19 +261,19 @@
         <P20977 para="Account2.SCABargeIn">0</P20977>
         <!--Account3/Basic-->
         <P501 para="Account3.Active">1</P501>
-        <P502 para="Account3.Sipserver">{$server_address_3}</P502>
+        <P502 para="Account3.Sipserver">{$account.3.server_address}</P502>
         <P988 para="Account3.FailoverSipserver" />
         <P8853 para="Account3.SecondFailoverSipserver" />
         <P4569 para="Account3.PreferPrimaryServer">0</P4569>
-        <P503 para="Account3.OutboundProxy">{$outbound_proxy_primary_3}</P503>
-        <P20049 para="Account3.BackUpOutboundProxy">{$outbound_proxy_secondary_3}</P20049>
+        <P503 para="Account3.OutboundProxy">{$account.3.outbound_proxy_primary}</P503>
+        <P20049 para="Account3.BackUpOutboundProxy">{$account.3.outbound_proxy_secondary}</P20049>
         <P930 para="Account3.SipTransport">{$htek_transport}</P930>
         <P514 para="Account3.NatTraversal">2</P514>
-        <P20002 para="Account3.Lable">{$display_name_3}</P20002>
-        <P504 para="Account3.SipUserId">{$user_id_3}</P504>
-        <P505 para="Account3.AuthenticateID">{$auth_id_3}</P505>
-        <P506 para="Account3.AuthenticatePassword">{$user_password_3}</P506>
-        <P507 para="Account3.DispalyName">{$display_name_3}</P507>
+        <P20002 para="Account3.Lable">{$account.3.display_name}</P20002>
+        <P504 para="Account3.SipUserId">{$account.3.user_id}</P504>
+        <P505 para="Account3.AuthenticateID">{$account.3.auth_id}</P505>
+        <P506 para="Account3.AuthenticatePassword">{$account.3.user_password}</P506>
+        <P507 para="Account3.DispalyName">{$account.3.display_name}</P507>
         <P508 para="Account3.DnsMode">{$htek_dns_mode}</P508>
         <P509 para="Account3.UserIdIsPhoneNumber">0</P509>
         <P510 para="Account3.SipRegistration">1</P510>