diff --git a/resources/templates/provision/yealink/t41p/y000000000036.cfg b/resources/templates/provision/yealink/t41p/y000000000036.cfg
index 3919accc1e..68d01be57d 100644
--- a/resources/templates/provision/yealink/t41p/y000000000036.cfg
+++ b/resources/templates/provision/yealink/t41p/y000000000036.cfg
@@ -1258,29 +1258,30 @@ linekey.27.label =
 #expansion_module.x.key.y.label =
 #expansion_module.X.key.Y.xml_phonebook =
 
-#Each expansion module1 key1
-expansion_module.1.key.1.type =
-expansion_module.1.key.1.line =
-expansion_module.1.key.1.value =
-expansion_module.1.key.1.pickup_value =
-expansion_module.1.key.1.label =
-expansion_module.1.key.1.xml_phonebook =
-
-#Each expansion module1 key2
-expansion_module.1.key.2.type =
-expansion_module.1.key.2.line =
-expansion_module.1.key.2.value =
-expansion_module.1.key.2.pickup_value =
-expansion_module.1.key.2.label =
-expansion_module.1.key.2.xml_phonebook =
-
-#Each expansion module2 key1
-expansion_module.2.key.1.type =
-expansion_module.2.key.1.line =
-expansion_module.2.key.1.value =
-expansion_module.2.key.1.pickup_value =
-expansion_module.2.key.1.label =
-expansion_module.2.key.1.xml_phonebook =
+{foreach $keys["expansion"] as $row}
+expansion_module.1.key.{$row.device_key_id}.type = {$row.device_key_type}
+expansion_module.1.key.{$row.device_key_id}.line = {$row.device_key_line}
+expansion_module.1.key.{$row.device_key_id}.value = {$row.device_key_value}
+expansion_module.1.key.{$row.device_key_id}.extension = {$row.device_key_extension}
+expansion_module.1.key.{$row.device_key_id}.label = {$row.device_key_label}
+expansion_module.1.key.{$row.device_key_id}.xml_phonebook =
+{/foreach}
+{foreach $keys["expansion-1"] as $row}
+expansion_module.1.key.{$row.device_key_id}.type = {$row.device_key_type}
+expansion_module.1.key.{$row.device_key_id}.line = {$row.device_key_line}
+expansion_module.1.key.{$row.device_key_id}.value = {$row.device_key_value}
+expansion_module.1.key.{$row.device_key_id}.extension = {$row.device_key_extension}
+expansion_module.1.key.{$row.device_key_id}.label = {$row.device_key_label}
+expansion_module.1.key.{$row.device_key_id}.xml_phonebook =
+{/foreach}
+{foreach $keys["expansion-2"] as $row}
+expansion_module.2.key.{$row.device_key_id}.type = {$row.device_key_type}
+expansion_module.2.key.{$row.device_key_id}.line = {$row.device_key_line}
+expansion_module.2.key.{$row.device_key_id}.value = {$row.device_key_value}
+expansion_module.2.key.{$row.device_key_id}.extension = {$row.device_key_extension}
+expansion_module.2.key.{$row.device_key_id}.label = {$row.device_key_label}
+expansion_module.2.key.{$row.device_key_id}.xml_phonebook =
+{/foreach}
 
 #######################################################################################
 ##                                   Forward Always                                  ##