diff --git a/resources/templates/provision/cisco/8811/{$mac}.xml b/resources/templates/provision/cisco/8811/{$mac}.xml
index 2dd310308f..c53d5ab584 100644
--- a/resources/templates/provision/cisco/8811/{$mac}.xml
+++ b/resources/templates/provision/cisco/8811/{$mac}.xml
@@ -1452,20 +1452,17 @@
 <BXfer_On_Speed_Dial_Enable ua="na">Yes</BXfer_On_Speed_Dial_Enable>
 <BLF_Label_Display_Mode ua="na">Name</BLF_Label_Display_Mode>
 <!-- Unit 1 -->
-{foreach $keys["expansion"] as $row}
-<Unit_1_Key_{$row.device_key_id} group="Attendant_Console/Unit_1">{$row.device_key_value}</Unit_1_Key_{$row.device_key_id}>
-{/foreach}
 {foreach $keys["expansion-1"] as $row}
-<Unit_1_Key_{$row.device_key_id} group="Attendant_Console/Unit_1">{$row.device_key_value}</Unit_1_Key_{$row.device_key_id}>
+<Unit_1_Key_{$row.device_key_id}_ ua="na" um="y">{$row.device_key_value};nme={$row.device_key_label}</Unit_1_Key_{$row.device_key_id}_>
 {/foreach}
-{foreach $keys["expansion-2"] as $row}
-<Unit_2_Key_{$row.device_key_id} group="Attendant_Console/Unit_2">{$row.device_key_value}</Unit_2_Key_{$row.device_key_id}>
-{/foreach}
-
 <!-- Unit 2 -->
-
+{foreach $keys["expansion-2"] as $row}
+<Unit_2_Key_{$row.device_key_id}_ ua="na" um="y">{$row.device_key_value};nme={$row.device_key_label}</Unit_2_Key_{$row.device_key_id}_>
+{/foreach}
 <!-- Unit 3 -->
-
+{foreach $keys["expansion-3"] as $row}
+<Unit_3_Key_{$row.device_key_id}_ ua="na" um="y">{$row.device_key_value};nme={$row.device_key_label}</Unit_3_Key_{$row.device_key_id}_>
+{/foreach}
 <!-- TR-069 -->
 <Enable_TR-069 ua="na">No</Enable_TR-069>
 <ACS_URL ua="na"/>
diff --git a/resources/templates/provision/cisco/8832/{$mac}.xml b/resources/templates/provision/cisco/8832/{$mac}.xml
index 2dd310308f..c53d5ab584 100644
--- a/resources/templates/provision/cisco/8832/{$mac}.xml
+++ b/resources/templates/provision/cisco/8832/{$mac}.xml
@@ -1452,20 +1452,17 @@
 <BXfer_On_Speed_Dial_Enable ua="na">Yes</BXfer_On_Speed_Dial_Enable>
 <BLF_Label_Display_Mode ua="na">Name</BLF_Label_Display_Mode>
 <!-- Unit 1 -->
-{foreach $keys["expansion"] as $row}
-<Unit_1_Key_{$row.device_key_id} group="Attendant_Console/Unit_1">{$row.device_key_value}</Unit_1_Key_{$row.device_key_id}>
-{/foreach}
 {foreach $keys["expansion-1"] as $row}
-<Unit_1_Key_{$row.device_key_id} group="Attendant_Console/Unit_1">{$row.device_key_value}</Unit_1_Key_{$row.device_key_id}>
+<Unit_1_Key_{$row.device_key_id}_ ua="na" um="y">{$row.device_key_value};nme={$row.device_key_label}</Unit_1_Key_{$row.device_key_id}_>
 {/foreach}
-{foreach $keys["expansion-2"] as $row}
-<Unit_2_Key_{$row.device_key_id} group="Attendant_Console/Unit_2">{$row.device_key_value}</Unit_2_Key_{$row.device_key_id}>
-{/foreach}
-
 <!-- Unit 2 -->
-
+{foreach $keys["expansion-2"] as $row}
+<Unit_2_Key_{$row.device_key_id}_ ua="na" um="y">{$row.device_key_value};nme={$row.device_key_label}</Unit_2_Key_{$row.device_key_id}_>
+{/foreach}
 <!-- Unit 3 -->
-
+{foreach $keys["expansion-3"] as $row}
+<Unit_3_Key_{$row.device_key_id}_ ua="na" um="y">{$row.device_key_value};nme={$row.device_key_label}</Unit_3_Key_{$row.device_key_id}_>
+{/foreach}
 <!-- TR-069 -->
 <Enable_TR-069 ua="na">No</Enable_TR-069>
 <ACS_URL ua="na"/>
diff --git a/resources/templates/provision/cisco/8841/{$mac}.xml b/resources/templates/provision/cisco/8841/{$mac}.xml
index 2dd310308f..c53d5ab584 100644
--- a/resources/templates/provision/cisco/8841/{$mac}.xml
+++ b/resources/templates/provision/cisco/8841/{$mac}.xml
@@ -1452,20 +1452,17 @@
 <BXfer_On_Speed_Dial_Enable ua="na">Yes</BXfer_On_Speed_Dial_Enable>
 <BLF_Label_Display_Mode ua="na">Name</BLF_Label_Display_Mode>
 <!-- Unit 1 -->
-{foreach $keys["expansion"] as $row}
-<Unit_1_Key_{$row.device_key_id} group="Attendant_Console/Unit_1">{$row.device_key_value}</Unit_1_Key_{$row.device_key_id}>
-{/foreach}
 {foreach $keys["expansion-1"] as $row}
-<Unit_1_Key_{$row.device_key_id} group="Attendant_Console/Unit_1">{$row.device_key_value}</Unit_1_Key_{$row.device_key_id}>
+<Unit_1_Key_{$row.device_key_id}_ ua="na" um="y">{$row.device_key_value};nme={$row.device_key_label}</Unit_1_Key_{$row.device_key_id}_>
 {/foreach}
-{foreach $keys["expansion-2"] as $row}
-<Unit_2_Key_{$row.device_key_id} group="Attendant_Console/Unit_2">{$row.device_key_value}</Unit_2_Key_{$row.device_key_id}>
-{/foreach}
-
 <!-- Unit 2 -->
-
+{foreach $keys["expansion-2"] as $row}
+<Unit_2_Key_{$row.device_key_id}_ ua="na" um="y">{$row.device_key_value};nme={$row.device_key_label}</Unit_2_Key_{$row.device_key_id}_>
+{/foreach}
 <!-- Unit 3 -->
-
+{foreach $keys["expansion-3"] as $row}
+<Unit_3_Key_{$row.device_key_id}_ ua="na" um="y">{$row.device_key_value};nme={$row.device_key_label}</Unit_3_Key_{$row.device_key_id}_>
+{/foreach}
 <!-- TR-069 -->
 <Enable_TR-069 ua="na">No</Enable_TR-069>
 <ACS_URL ua="na"/>
diff --git a/resources/templates/provision/cisco/8845/{$mac}.xml b/resources/templates/provision/cisco/8845/{$mac}.xml
index 2dd310308f..c53d5ab584 100644
--- a/resources/templates/provision/cisco/8845/{$mac}.xml
+++ b/resources/templates/provision/cisco/8845/{$mac}.xml
@@ -1452,20 +1452,17 @@
 <BXfer_On_Speed_Dial_Enable ua="na">Yes</BXfer_On_Speed_Dial_Enable>
 <BLF_Label_Display_Mode ua="na">Name</BLF_Label_Display_Mode>
 <!-- Unit 1 -->
-{foreach $keys["expansion"] as $row}
-<Unit_1_Key_{$row.device_key_id} group="Attendant_Console/Unit_1">{$row.device_key_value}</Unit_1_Key_{$row.device_key_id}>
-{/foreach}
 {foreach $keys["expansion-1"] as $row}
-<Unit_1_Key_{$row.device_key_id} group="Attendant_Console/Unit_1">{$row.device_key_value}</Unit_1_Key_{$row.device_key_id}>
+<Unit_1_Key_{$row.device_key_id}_ ua="na" um="y">{$row.device_key_value};nme={$row.device_key_label}</Unit_1_Key_{$row.device_key_id}_>
 {/foreach}
-{foreach $keys["expansion-2"] as $row}
-<Unit_2_Key_{$row.device_key_id} group="Attendant_Console/Unit_2">{$row.device_key_value}</Unit_2_Key_{$row.device_key_id}>
-{/foreach}
-
 <!-- Unit 2 -->
-
+{foreach $keys["expansion-2"] as $row}
+<Unit_2_Key_{$row.device_key_id}_ ua="na" um="y">{$row.device_key_value};nme={$row.device_key_label}</Unit_2_Key_{$row.device_key_id}_>
+{/foreach}
 <!-- Unit 3 -->
-
+{foreach $keys["expansion-3"] as $row}
+<Unit_3_Key_{$row.device_key_id}_ ua="na" um="y">{$row.device_key_value};nme={$row.device_key_label}</Unit_3_Key_{$row.device_key_id}_>
+{/foreach}
 <!-- TR-069 -->
 <Enable_TR-069 ua="na">No</Enable_TR-069>
 <ACS_URL ua="na"/>
diff --git a/resources/templates/provision/cisco/8851/{$mac}.xml b/resources/templates/provision/cisco/8851/{$mac}.xml
index 2dd310308f..f28d16498e 100644
--- a/resources/templates/provision/cisco/8851/{$mac}.xml
+++ b/resources/templates/provision/cisco/8851/{$mac}.xml
@@ -1441,7 +1441,7 @@
 <!-- General -->
 <Subscribe_Expires ua="na">1800</Subscribe_Expires>
 <Subscribe_Retry_Interval ua="na">30</Subscribe_Retry_Interval>
-<Number_of_Units ua="na">0</Number_of_Units>
+<Number_of_Units ua="na">2</Number_of_Units>
 <Subscribe_Delay ua="na">1</Subscribe_Delay>
 <Server_Type ua="na">Broadsoft</Server_Type>
 <BLF_List_URI ua="na"/>
@@ -1452,20 +1452,17 @@
 <BXfer_On_Speed_Dial_Enable ua="na">Yes</BXfer_On_Speed_Dial_Enable>
 <BLF_Label_Display_Mode ua="na">Name</BLF_Label_Display_Mode>
 <!-- Unit 1 -->
-{foreach $keys["expansion"] as $row}
-<Unit_1_Key_{$row.device_key_id} group="Attendant_Console/Unit_1">{$row.device_key_value}</Unit_1_Key_{$row.device_key_id}>
-{/foreach}
 {foreach $keys["expansion-1"] as $row}
-<Unit_1_Key_{$row.device_key_id} group="Attendant_Console/Unit_1">{$row.device_key_value}</Unit_1_Key_{$row.device_key_id}>
+<Unit_1_Key_{$row.device_key_id}_ ua="na" um="y">{$row.device_key_value};nme={$row.device_key_label}</Unit_1_Key_{$row.device_key_id}_>
 {/foreach}
-{foreach $keys["expansion-2"] as $row}
-<Unit_2_Key_{$row.device_key_id} group="Attendant_Console/Unit_2">{$row.device_key_value}</Unit_2_Key_{$row.device_key_id}>
-{/foreach}
-
 <!-- Unit 2 -->
-
+{foreach $keys["expansion-2"] as $row}
+<Unit_2_Key_{$row.device_key_id}_ ua="na" um="y">{$row.device_key_value};nme={$row.device_key_label}</Unit_2_Key_{$row.device_key_id}_>
+{/foreach}
 <!-- Unit 3 -->
-
+{foreach $keys["expansion-3"] as $row}
+<Unit_3_Key_{$row.device_key_id}_ ua="na" um="y">{$row.device_key_value};nme={$row.device_key_label}</Unit_3_Key_{$row.device_key_id}_>
+{/foreach}
 <!-- TR-069 -->
 <Enable_TR-069 ua="na">No</Enable_TR-069>
 <ACS_URL ua="na"/>
diff --git a/resources/templates/provision/cisco/8861/{$mac}.xml b/resources/templates/provision/cisco/8861/{$mac}.xml
index 2dd310308f..a814334af9 100644
--- a/resources/templates/provision/cisco/8861/{$mac}.xml
+++ b/resources/templates/provision/cisco/8861/{$mac}.xml
@@ -1441,7 +1441,7 @@
 <!-- General -->
 <Subscribe_Expires ua="na">1800</Subscribe_Expires>
 <Subscribe_Retry_Interval ua="na">30</Subscribe_Retry_Interval>
-<Number_of_Units ua="na">0</Number_of_Units>
+<Number_of_Units ua="na">3</Number_of_Units>
 <Subscribe_Delay ua="na">1</Subscribe_Delay>
 <Server_Type ua="na">Broadsoft</Server_Type>
 <BLF_List_URI ua="na"/>
@@ -1452,20 +1452,17 @@
 <BXfer_On_Speed_Dial_Enable ua="na">Yes</BXfer_On_Speed_Dial_Enable>
 <BLF_Label_Display_Mode ua="na">Name</BLF_Label_Display_Mode>
 <!-- Unit 1 -->
-{foreach $keys["expansion"] as $row}
-<Unit_1_Key_{$row.device_key_id} group="Attendant_Console/Unit_1">{$row.device_key_value}</Unit_1_Key_{$row.device_key_id}>
-{/foreach}
 {foreach $keys["expansion-1"] as $row}
-<Unit_1_Key_{$row.device_key_id} group="Attendant_Console/Unit_1">{$row.device_key_value}</Unit_1_Key_{$row.device_key_id}>
+<Unit_1_Key_{$row.device_key_id}_ ua="na" um="y">{$row.device_key_value};nme={$row.device_key_label}</Unit_1_Key_{$row.device_key_id}_>
 {/foreach}
-{foreach $keys["expansion-2"] as $row}
-<Unit_2_Key_{$row.device_key_id} group="Attendant_Console/Unit_2">{$row.device_key_value}</Unit_2_Key_{$row.device_key_id}>
-{/foreach}
-
 <!-- Unit 2 -->
-
+{foreach $keys["expansion-2"] as $row}
+<Unit_2_Key_{$row.device_key_id}_ ua="na" um="y">{$row.device_key_value};nme={$row.device_key_label}</Unit_2_Key_{$row.device_key_id}_>
+{/foreach}
 <!-- Unit 3 -->
-
+{foreach $keys["expansion-3"] as $row}
+<Unit_3_Key_{$row.device_key_id}_ ua="na" um="y">{$row.device_key_value};nme={$row.device_key_label}</Unit_3_Key_{$row.device_key_id}_>
+{/foreach}
 <!-- TR-069 -->
 <Enable_TR-069 ua="na">No</Enable_TR-069>
 <ACS_URL ua="na"/>
diff --git a/resources/templates/provision/cisco/8865/{$mac}.xml b/resources/templates/provision/cisco/8865/{$mac}.xml
index 2dd310308f..a814334af9 100644
--- a/resources/templates/provision/cisco/8865/{$mac}.xml
+++ b/resources/templates/provision/cisco/8865/{$mac}.xml
@@ -1441,7 +1441,7 @@
 <!-- General -->
 <Subscribe_Expires ua="na">1800</Subscribe_Expires>
 <Subscribe_Retry_Interval ua="na">30</Subscribe_Retry_Interval>
-<Number_of_Units ua="na">0</Number_of_Units>
+<Number_of_Units ua="na">3</Number_of_Units>
 <Subscribe_Delay ua="na">1</Subscribe_Delay>
 <Server_Type ua="na">Broadsoft</Server_Type>
 <BLF_List_URI ua="na"/>
@@ -1452,20 +1452,17 @@
 <BXfer_On_Speed_Dial_Enable ua="na">Yes</BXfer_On_Speed_Dial_Enable>
 <BLF_Label_Display_Mode ua="na">Name</BLF_Label_Display_Mode>
 <!-- Unit 1 -->
-{foreach $keys["expansion"] as $row}
-<Unit_1_Key_{$row.device_key_id} group="Attendant_Console/Unit_1">{$row.device_key_value}</Unit_1_Key_{$row.device_key_id}>
-{/foreach}
 {foreach $keys["expansion-1"] as $row}
-<Unit_1_Key_{$row.device_key_id} group="Attendant_Console/Unit_1">{$row.device_key_value}</Unit_1_Key_{$row.device_key_id}>
+<Unit_1_Key_{$row.device_key_id}_ ua="na" um="y">{$row.device_key_value};nme={$row.device_key_label}</Unit_1_Key_{$row.device_key_id}_>
 {/foreach}
-{foreach $keys["expansion-2"] as $row}
-<Unit_2_Key_{$row.device_key_id} group="Attendant_Console/Unit_2">{$row.device_key_value}</Unit_2_Key_{$row.device_key_id}>
-{/foreach}
-
 <!-- Unit 2 -->
-
+{foreach $keys["expansion-2"] as $row}
+<Unit_2_Key_{$row.device_key_id}_ ua="na" um="y">{$row.device_key_value};nme={$row.device_key_label}</Unit_2_Key_{$row.device_key_id}_>
+{/foreach}
 <!-- Unit 3 -->
-
+{foreach $keys["expansion-3"] as $row}
+<Unit_3_Key_{$row.device_key_id}_ ua="na" um="y">{$row.device_key_value};nme={$row.device_key_label}</Unit_3_Key_{$row.device_key_id}_>
+{/foreach}
 <!-- TR-069 -->
 <Enable_TR-069 ua="na">No</Enable_TR-069>
 <ACS_URL ua="na"/>