diff --git a/resources/templates/provision/cisco/spa504g/{$mac}.xml b/resources/templates/provision/cisco/spa504g/{$mac}.xml
index 8cf6f8d6b7..767ace380b 100644
--- a/resources/templates/provision/cisco/spa504g/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa504g/{$mac}.xml
@@ -635,68 +635,17 @@
 <Server_Type group="Attendant_Console/General">Asterisk</Server_Type>
 <Test_Mode_Enable group="Attendant_Console/General">No</Test_Mode_Enable>
 <Attendant_Console_Call_Pickup_Code group="Attendant_Console/General">**#</Attendant_Console_Call_Pickup_Code>
-<Unit_1_Key_1 group="Attendant_Console/Unit_1" />
-<Unit_1_Key_2 group="Attendant_Console/Unit_1" />
-<Unit_1_Key_3 group="Attendant_Console/Unit_1" />
-<Unit_1_Key_4 group="Attendant_Console/Unit_1" />
-<Unit_1_Key_5 group="Attendant_Console/Unit_1" />
-<Unit_1_Key_6 group="Attendant_Console/Unit_1" />
-<Unit_1_Key_7 group="Attendant_Console/Unit_1" />
-<Unit_1_Key_8 group="Attendant_Console/Unit_1" />
-<Unit_1_Key_9 group="Attendant_Console/Unit_1" />
-<Unit_1_Key_10 group="Attendant_Console/Unit_1" />
-<Unit_1_Key_11 group="Attendant_Console/Unit_1" />
-<Unit_1_Key_12 group="Attendant_Console/Unit_1" />
-<Unit_1_Key_13 group="Attendant_Console/Unit_1" />
-<Unit_1_Key_14 group="Attendant_Console/Unit_1" />
-<Unit_1_Key_15 group="Attendant_Console/Unit_1" />
-<Unit_1_Key_16 group="Attendant_Console/Unit_1" />
-<Unit_1_Key_17 group="Attendant_Console/Unit_1" />
-<Unit_1_Key_18 group="Attendant_Console/Unit_1" />
-<Unit_1_Key_19 group="Attendant_Console/Unit_1" />
-<Unit_1_Key_20 group="Attendant_Console/Unit_1" />
-<Unit_1_Key_21 group="Attendant_Console/Unit_1" />
-<Unit_1_Key_22 group="Attendant_Console/Unit_1" />
-<Unit_1_Key_23 group="Attendant_Console/Unit_1" />
-<Unit_1_Key_24 group="Attendant_Console/Unit_1" />
-<Unit_1_Key_25 group="Attendant_Console/Unit_1" />
-<Unit_1_Key_26 group="Attendant_Console/Unit_1" />
-<Unit_1_Key_27 group="Attendant_Console/Unit_1" />
-<Unit_1_Key_28 group="Attendant_Console/Unit_1" />
-<Unit_1_Key_29 group="Attendant_Console/Unit_1" />
-<Unit_1_Key_30 group="Attendant_Console/Unit_1" />
-<Unit_1_Key_31 group="Attendant_Console/Unit_1" />
-<Unit_1_Key_32 group="Attendant_Console/Unit_1" />
-<Unit_2_Key_1 group="Attendant_Console/Unit_2" />
-<Unit_2_Key_2 group="Attendant_Console/Unit_2" />
-<Unit_2_Key_3 group="Attendant_Console/Unit_2" />
-<Unit_2_Key_4 group="Attendant_Console/Unit_2" />
-<Unit_2_Key_5 group="Attendant_Console/Unit_2" />
-<Unit_2_Key_6 group="Attendant_Console/Unit_2" />
-<Unit_2_Key_7 group="Attendant_Console/Unit_2" />
-<Unit_2_Key_8 group="Attendant_Console/Unit_2" />
-<Unit_2_Key_9 group="Attendant_Console/Unit_2" />
-<Unit_2_Key_10 group="Attendant_Console/Unit_2" />
-<Unit_2_Key_11 group="Attendant_Console/Unit_2" />
-<Unit_2_Key_12 group="Attendant_Console/Unit_2" />
-<Unit_2_Key_13 group="Attendant_Console/Unit_2" />
-<Unit_2_Key_14 group="Attendant_Console/Unit_2" />
-<Unit_2_Key_15 group="Attendant_Console/Unit_2" />
-<Unit_2_Key_16 group="Attendant_Console/Unit_2" />
-<Unit_2_Key_17 group="Attendant_Console/Unit_2" />
-<Unit_2_Key_18 group="Attendant_Console/Unit_2" />
-<Unit_2_Key_19 group="Attendant_Console/Unit_2" />
-<Unit_2_Key_20 group="Attendant_Console/Unit_2" />
-<Unit_2_Key_21 group="Attendant_Console/Unit_2" />
-<Unit_2_Key_22 group="Attendant_Console/Unit_2" />
-<Unit_2_Key_23 group="Attendant_Console/Unit_2" />
-<Unit_2_Key_24 group="Attendant_Console/Unit_2" />
-<Unit_2_Key_25 group="Attendant_Console/Unit_2" />
-<Unit_2_Key_26 group="Attendant_Console/Unit_2" />
-<Unit_2_Key_27 group="Attendant_Console/Unit_2" />
-<Unit_2_Key_28 group="Attendant_Console/Unit_2" />
-<Unit_2_Key_29 group="Attendant_Console/Unit_2" />
-<Unit_2_Key_30 group="Attendant_Console/Unit_2" />
-<Unit_2_Key_31 group="Attendant_Console/Unit_2" />
-<Unit_2_Key_32 group="Attendant_Console/Unit_2" />
+
+{foreach $keys as $row}
+{if $row.device_key_category == "expansion"}
+<Unit_1_Key_{$row.device_key_id} group="Attendant_Console/Unit_1">{$row.device_key_value}</Unit_1_Key_{$row.device_key_id}>
+{/if}
+{if $row.device_key_category == "expansion-1"}
+<Unit_1_Key_{$row.device_key_id} group="Attendant_Console/Unit_1">{$row.device_key_value}</Unit_1_Key_{$row.device_key_id}>
+{/if}
+{if $row.device_key_category == "expansion-2"}
+<Unit_2_Key_{$row.device_key_id} group="Attendant_Console/Unit_2">{$row.device_key_value}</Unit_2_Key_{$row.device_key_id}>
+{/if}
+{/foreach}
+
 </flat-profile>