diff --git a/resources/templates/provision/polycom/3.x/{$mac}.cfg b/resources/templates/provision/polycom/3.x/{$mac}.cfg
index d90ce262b1..0753ff16dc 100644
--- a/resources/templates/provision/polycom/3.x/{$mac}.cfg
+++ b/resources/templates/provision/polycom/3.x/{$mac}.cfg
@@ -1,17 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <PHONE>
 	<REGISTRATION
-
-		reg.{$row.line_number}.serverFeatureControl.cf="{$polycom_feature_key_sync}"
-        	reg.{$row.line_number}.serverFeatureControl.dnd="{$polycom_feature_key_sync}"
-		
-		{foreach $lines as $row}reg.{$row.line_number}.displayName="{$row.display_name}"
+		{foreach $lines as $row}
+		reg.{$row.line_number}.displayName="{$row.display_name}"
 		reg.{$row.line_number}.address="{$row.user_id}@{$row.server_address}"
 		reg.{$row.line_number}.label="{$row.display_name}"
+
+		reg.{$row.line_number}.serverFeatureControl.cf="{$polycom_feature_key_sync}"
+		reg.{$row.line_number}.serverFeatureControl.dnd="{$polycom_feature_key_sync}"
+
 		reg.{$row.line_number}.type="private"
 		reg.{$row.line_number}.auth.userId="{$row.user_id}"
 		reg.{$row.line_number}.auth.password="{$row.password}"
 		{if isset($line_key_value_{$row.line_number})}reg.{$row.line_number}.lineKeys="{$line_key_value_{$row.line_number}}"{else}reg.{$row.line_number}.lineKeys="1"{/if}
+
 		{if isset($row.outbound_proxy)}reg.{$row.line_number}.outboundProxy.address = "{$row.outbound_proxy}"{/if}
 		{if isset($row.sip_port)}reg.{$row.line_number}.outboundProxy.port="{$row.sip_port}"{else}reg.{$row.line_number}.outboundProxy.port="5060"{/if}
 
@@ -34,30 +36,8 @@
 
 		{/foreach}
 	/>
-	<DEVICE_SETTINGS
-		device.set="1"
-		device.sntp.serverName="pool.ntp.org"
-		device.sntp.gmtOffset="{$polycom_gmt_offset}"
-		{if isset($admin_password)}
-		device.auth.localUserPassword.set="1" 
-		device.auth.localUserPassword="{$admin_password}"
-		{/if}
-		{if isset($admin_password)}
-		device.auth.localAdminPassword.set="1"
-		device.auth.localAdminPassword="{$admin_password}"
-		{/if}
-		{if isset($dns_server_primary)}device.dns.serverAddress="{$dns_server_primary}"{/if}
-		{if isset($dns_server_secondary)}device.dns.altSrvAddress="{$dns_server_secondary}"{/if}
-		{if isset($polycom_provision_url)}
-		device.prov.serverName="{$polycom_provision_url}"
-		{else}
-		device.prov.serverName="{$domain_name}"
-		{/if}
-		device.prov.serverType="{$polycom_server_type}"
-		device.prov.user="{$http_auth_username}"
-		device.prov.password="{$http_auth_password}"
-	/>
 	<SNTP
+		tcpIpApp.sntp.gmtOffset="{$polycom_gmt_offset}"
 		tcpIpApp.sntp.resyncPeriod="86400"
 		tcpIpApp.sntp.address="{$ntp_server_primary}"
 		tcpIpApp.sntp.gmtOffset.overrideDHCP="0"
@@ -100,60 +80,38 @@
 		{else}
 			attendant.behaviors.display.spontaneousCallAppearances.normal="0"
 		{/if}
-		feature.enhancedFeatureKeys.enabled="1"
 		{foreach $keys["line"] as $row}
 			{if $row.device_key_type == "automata" || $row.device_key_type == "normal"}
 				attendant.resourceList.{$row.device_key_id}.address="{$row.device_key_value}"
-				attendant.resourceList.{$row.device_key_id}.callAddress=""
 				attendant.resourceList.{$row.device_key_id}.label="{$row.device_key_label}"
-				attendant.resourceList.{$row.device_key_id}.proceedingIsRecipient="0"
 				attendant.resourceList.{$row.device_key_id}.type="{$row.device_key_type}"
-			{else}
-				{if $row.device_key_type != "line"}
-					{if $row.device_key_type == "URL"}
-						key.{$row.device_key_id}.function.prim="{$row.device_key_value}"
-					{else}
-						key.{$row.device_key_id}.function.prim="{$row.device_key_type}"
-						key.{$row.device_key_id}.subPoint.prim="{$row.device_key_value}"
-					{/if}
-				{/if}
 			{/if}
 		{/foreach}
 	/>
-	<MULTICAST_PAGING
-		ptt.pageMode.enable="0"
-		ptt.pageMode.displayName="INTERCOM"
-	/>
-	<REMOTE_PACKET_CAPTURE
-		diags.pcap.enabled="0"
-		diags.pcap.remote.enabled="0"
-	/>
 	<GENERAL
-		nat.keepalive.interval="30"
+		tcpIpApp.keepalive.tcp.idleTransmitInterval="30" 
+		tcpIpApp.keepalive.tcp.noResponseTrasmitInterval="300" 
 		voIpProt.SIP.specialEvent.checkSync.alwaysReboot="1"
 		voIpProt.SIP.requestValidation.1.request="INVITE" 
 		voIpProt.SIP.requestValidation.1.method="source"
-		feature.broadsoftUcOne.enabled="0"
 		voice.volume.persist.handset="1"
+		voice.volume.persist.headset="1"
 		voice.volume.persist.handsfree="1"
-		feature.nonVolatileRingerVolume.enabled="1"
-		{if $headset_mode != ''}up.handsfreeMode="1"
-		up.headsetMode="{$headset_mode}"{/if}
+		{if $headset_mode != ''}
+		up.handsfreeMode="1"
+		up.headsetMode="{$headset_mode}"
+		{/if}
 		{if $analog_headset_option != ''}up.analogHeadsetOption="{$analog_headset_option}"{/if}
 		{if isset($polycom_onetouchvoicemail)}
 			up.oneTouchVoiceMail="{$polycom_onetouchvoicemail}"
-			{else}
+		{else}
 			up.oneTouchVoiceMail="0"
 		{/if}
-		exchange.server.url="0.0.0.0"
 	/>
 	<SOFT_KEYS
 		softkey.1.label="VMTransfer"
 		softkey.1.action="^*99$P1N4$$Trefer$"
 		softkey.1.enable="1"
 		softkey.1.use.active="1"
-		efk.efkprompt.1.label="Voice Mail ID to transfer to:"
-		efk.efkprompt.1.status="1"
-		efk.efkprompt.1.type="numeric"
 	/>
 </PHONE>