diff --git a/resources/templates/provision/panasonic/ut670/{$mac}.cfg b/resources/templates/provision/panasonic/ut670/{$mac}.cfg
index 352e59985d..f56a3e54ac 100644
--- a/resources/templates/provision/panasonic/ut670/{$mac}.cfg
+++ b/resources/templates/provision/panasonic/ut670/{$mac}.cfg
@@ -22,7 +22,7 @@ FIRM_FILE_PATH=""
 ## Provisioning Settings
 OPTION66_ENABLE="Y"
 PROVISION_ENABLE="Y"
-CFG_STANDARD_FILE_PATH="tftp://{$server_address_1}/{literal}{mac}{/literal}.cfg"
+CFG_STANDARD_FILE_PATH="tftp://{$account.1.server_address}/{literal}{mac}{/literal}.cfg"
 CFG_PRODUCT_FILE_PATH=""
 CFG_MASTER_FILE_PATH=""
 # CFG_FILE_KEY1="" # Not to overwrite factory default key
@@ -402,18 +402,18 @@ HOLD_SOUND_PATH_6="0"
 
 ## SIP Settings
 SIP_USER_AGENT="Panasonic_{literal}{MODEL}/{/{fwver} ({mac}{/literal})"
-PHONE_NUMBER_1="{$user_id_1}"
-PHONE_NUMBER_2="{$user_id_2}"
-PHONE_NUMBER_3="{$user_id_3}"
-PHONE_NUMBER_4="{$user_id_4}"
-PHONE_NUMBER_5="{$user_id_5}"
-PHONE_NUMBER_6="{$user_id_6}"
-SIP_URI_1="{$user_id_1}"
-SIP_URI_2="{$user_id_2}"
-SIP_URI_3="{$user_id_3}"
-SIP_URI_4="{$user_id_4}"
-SIP_URI_5="{$user_id_5}"
-SIP_URI_6="{$user_id_6}"
+PHONE_NUMBER_1="{$account.1.user_id}"
+PHONE_NUMBER_2="{$account.2.user_id}"
+PHONE_NUMBER_3="{$account.3.user_id}"
+PHONE_NUMBER_4="{$account.4.user_id}"
+PHONE_NUMBER_5="{$account.5.user_id}"
+PHONE_NUMBER_6="{$account.6.user_id}"
+SIP_URI_1="{$account.1.user_id}"
+SIP_URI_2="{$account.2.user_id}"
+SIP_URI_3="{$account.3.user_id}"
+SIP_URI_4="{$account.4.user_id}"
+SIP_URI_5="{$account.5.user_id}"
+SIP_URI_6="{$account.6.user_id}"
 LINE_ENABLE_1="Enabled"
 LINE_ENABLE_2="Enabled"
 LINE_ENABLE_3="Enabled"
@@ -426,54 +426,54 @@ PROFILE_ENABLE_3="Enabled"
 PROFILE_ENABLE_4="Enabled"
 PROFILE_ENABLE_5="Enabled"
 PROFILE_ENABLE_6="Enabled"
-SIP_AUTHID_1="{$user_id_1}"
-SIP_AUTHID_2="{$user_id_2}"
-SIP_AUTHID_3="{$user_id_3}"
-SIP_AUTHID_4="{$user_id_4}"
-SIP_AUTHID_5="{$user_id_5}"
-SIP_AUTHID_6="{$user_id_6}"
-SIP_PASS_1="{$user_password_1}"
-SIP_PASS_2="{$user_password_2}"
-SIP_PASS_3="{$user_password_3}"
-SIP_PASS_4="{$user_password_4}"
-SIP_PASS_5="{$user_password_5}"
-SIP_PASS_6="{$user_password_6}"
+SIP_AUTHID_1="{$account.1.user_id}"
+SIP_AUTHID_2="{$account.2.user_id}"
+SIP_AUTHID_3="{$account.3.user_id}"
+SIP_AUTHID_4="{$account.4.user_id}"
+SIP_AUTHID_5="{$account.5.user_id}"
+SIP_AUTHID_6="{$account.6.user_id}"
+SIP_PASS_1="{$account.1.password}"
+SIP_PASS_2="{$account.2.password}"
+SIP_PASS_3="{$account.3.password}"
+SIP_PASS_4="{$account.4.password}"
+SIP_PASS_5="{$account.5.password}"
+SIP_PASS_6="{$account.6.password}"
 SIP_SRC_PORT_1="5060"
 SIP_SRC_PORT_2="5061"
 SIP_SRC_PORT_3="5062"
 SIP_SRC_PORT_4="5063"
 SIP_SRC_PORT_5="5064"
 SIP_SRC_PORT_6="5065"
-SIP_PRXY_ADDR_1="{$server_address_1}"
-SIP_PRXY_ADDR_2="{$server_address_2}"
-SIP_PRXY_ADDR_3="{$server_address_3}"
-SIP_PRXY_ADDR_4="{$server_address_4}"
-SIP_PRXY_ADDR_5="{$server_address_5}"
-SIP_PRXY_ADDR_6="{$server_address_6}"
+SIP_PRXY_ADDR_1="{$account.1.server_address}"
+SIP_PRXY_ADDR_2="{$account.2.server_address}"
+SIP_PRXY_ADDR_3="{$account.3.server_address}"
+SIP_PRXY_ADDR_4="{$account.4.server_address}"
+SIP_PRXY_ADDR_5="{$account.5.server_address}"
+SIP_PRXY_ADDR_6="{$account.6.server_address}"
 SIP_PRXY_PORT_1="5060"
 SIP_PRXY_PORT_2="5060"
 SIP_PRXY_PORT_3="5060"
 SIP_PRXY_PORT_4="5060"
 SIP_PRXY_PORT_5="5060"
 SIP_PRXY_PORT_6="5060"
-SIP_RGSTR_ADDR_1="{$server_address_1}"
-SIP_RGSTR_ADDR_2="{$server_address_2}"
-SIP_RGSTR_ADDR_3="{$server_address_3}"
-SIP_RGSTR_ADDR_4="{$server_address_4}"
-SIP_RGSTR_ADDR_5="{$server_address_5}"
-SIP_RGSTR_ADDR_6="{$server_address_6}"
+SIP_RGSTR_ADDR_1="{$account.1.server_address}"
+SIP_RGSTR_ADDR_2="{$account.2.server_address}"
+SIP_RGSTR_ADDR_3="{$account.3.server_address}"
+SIP_RGSTR_ADDR_4="{$account.4.server_address}"
+SIP_RGSTR_ADDR_5="{$account.5.server_address}"
+SIP_RGSTR_ADDR_6="{$account.6.server_address}"
 SIP_RGSTR_PORT_1="5060"
 SIP_RGSTR_PORT_2="5060"
 SIP_RGSTR_PORT_3="5060"
 SIP_RGSTR_PORT_4="5060"
 SIP_RGSTR_PORT_5="5060"
 SIP_RGSTR_PORT_6="5060"
-SIP_SVCDOMAIN_1="{$server_address_1}"
-SIP_SVCDOMAIN_2="{$server_address_2}"
-SIP_SVCDOMAIN_3="{$server_address_3}"
-SIP_SVCDOMAIN_4="{$server_address_4}"
-SIP_SVCDOMAIN_5="{$server_address_5}"
-SIP_SVCDOMAIN_6="{$server_address_6}"
+SIP_SVCDOMAIN_1="{$account.1.server_address}"
+SIP_SVCDOMAIN_2="{$account.2.server_address}"
+SIP_SVCDOMAIN_3="{$account.3.server_address}"
+SIP_SVCDOMAIN_4="{$account.4.server_address}"
+SIP_SVCDOMAIN_5="{$account.5.server_address}"
+SIP_SVCDOMAIN_6="{$account.6.server_address}"
 REG_EXPIRE_TIME_1="3600"
 REG_EXPIRE_TIME_2="3600"
 REG_EXPIRE_TIME_3="3600"
@@ -714,12 +714,12 @@ SIP_PRIVACY_3="N"
 SIP_PRIVACY_4="N"
 SIP_PRIVACY_5="N"
 SIP_PRIVACY_6="N"
-SIP_PRSNC_ADDR_1="{$server_address_1}"
-SIP_PRSNC_ADDR_2="{$server_address_2}"
-SIP_PRSNC_ADDR_3="{$server_address_3}"
-SIP_PRSNC_ADDR_4="{$server_address_4}"
-SIP_PRSNC_ADDR_5="{$server_address_5}"
-SIP_PRSNC_ADDR_6="{$server_address_6}"
+SIP_PRSNC_ADDR_1="{$account.1.server_address}"
+SIP_PRSNC_ADDR_2="{$account.2.server_address}"
+SIP_PRSNC_ADDR_3="{$account.3.server_address}"
+SIP_PRSNC_ADDR_4="{$account.4.server_address}"
+SIP_PRSNC_ADDR_5="{$account.5.server_address}"
+SIP_PRSNC_ADDR_6="{$account.6.server_address}"
 SIP_PRSNC_PORT_1="5060"
 SIP_PRSNC_PORT_2="5060"
 SIP_PRSNC_PORT_3="5060"