diff --git a/resources/templates/provision/fanvil/x6/{$mac}.cfg b/resources/templates/provision/fanvil/x6/{$mac}.cfg
index ba71fabb8f..f5471527f9 100644
--- a/resources/templates/provision/fanvil/x6/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x6/{$mac}.cfg
@@ -7,7 +7,7 @@
         <WANSubnetMask>255.255.255.0</WANSubnetMask>
         <WANGateway></WANGateway>
         <DomainName></DomainName>
-        <PrimaryDNS>{if isset($dns_server_primary)}{$dns_server_primary}{else}8.8.8.8{/if}</PrimaryDNS>
+        <PrimaryDNS>{if isset($dns_server_primary)}{$dns_server_primary}{else}9.9.9.9{/if}</PrimaryDNS>
         <SecondaryDNS>{if isset($dns_server_secondary)}{$dns_server_secondary}{else}208.67.222.222{/if}</SecondaryDNS>
         <EnableDHCP>1</EnableDHCP>
         <DHCPAutoDNS>1</DHCPAutoDNS>
@@ -1637,7 +1637,7 @@
         <CheckFailTimes>1</CheckFailTimes>
         <FlashServerIP>{if isset($fanvil_provision_url)}{$fanvil_provision_url}{else}https://{$domain_name}/app/provision{/if}</FlashServerIP>
         
-        <FlashFileName></FlashFileName>
+        <FlashFileName>{$fanvil_firmware_config}</FlashFileName>
         <FlashProtocol>5</FlashProtocol>
         <FlashMode>1</FlashMode>
         <FlashInterval>1</FlashInterval>
@@ -1773,7 +1773,70 @@
         <DSSExtend4IP></DSSExtend4IP>
         <DSSExtend5MAC></DSSExtend5MAC>
         <DSSExtend5IP></DSSExtend5IP>
+
 {strip}{*-- Each Internal Index contains 12 keys --*}{/strip}        
+
+        <internal index="1">
+{foreach $keys["line"] as $row}
+{if $row.device_key_id <= 12}
+            <Fkey index="{$row.device_key_id}">
+                <Type>{if $row.device_key_type == 3}0{elseif $row.device_key_type == 1}2{else}1{/if}</Type>
+                <Value>{if $row.device_key_type == 3}{elseif $row.device_key_type == 1}SIP{$row.device_key_line}{else}{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}{/if}</Value>
+                <Title>{$row.device_key_label}</Title>
+                <ICON>{$row.device_key_icon}</ICON>
+            </Fkey>
+{/if}
+{/foreach}
+        </internal>
+        <internal index="2">
+{foreach $keys["line"] as $row}
+{if $row.device_key_id > 12 && $row.device_key_id <= 24}
+            <Fkey index="{$row.device_key_id-12}">
+                <Type>{if $row.device_key_type == 3}0{elseif $row.device_key_type == 1}2{else}1{/if}</Type>
+                <Value>{if $row.device_key_type == 3}{elseif $row.device_key_type == 1}SIP{$row.device_key_line}{else}{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}{/if}</Value>
+                <Title>{$row.device_key_label}</Title>
+                <ICON>{$row.device_key_icon}</ICON>
+            </Fkey>
+{/if}
+{/foreach}
+        </internal>
+        <internal index="3">
+{foreach $keys["line"] as $row}
+{if $row.device_key_id > 24 && $row.device_key_id <= 36}
+            <Fkey index="{$row.device_key_id-24}">
+                <Type>{if $row.device_key_type == 3}0{elseif $row.device_key_type == 1}2{else}1{/if}</Type>
+                <Value>{if $row.device_key_type == 3}{elseif $row.device_key_type == 1}SIP{$row.device_key_line}{else}{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}{/if}</Value>
+                <Title>{$row.device_key_label}</Title>
+                <ICON>{$row.device_key_icon}</ICON>
+            </Fkey>
+{/if}
+{/foreach}
+        </internal>
+        <internal index="4">
+{foreach $keys["line"] as $row}
+{if $row.device_key_id > 36 && $row.device_key_id <= 48}
+            <Fkey index="{$row.device_key_id-36}">
+                <Type>{if $row.device_key_type == 3}0{elseif $row.device_key_type == 1}2{else}1{/if}</Type>
+                <Value>{if $row.device_key_type == 3}{elseif $row.device_key_type == 1}SIP{$row.device_key_line}{else}{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}{/if}</Value>
+                <Title>{$row.device_key_label}</Title>
+                <ICON>{$row.device_key_icon}</ICON>
+            </Fkey>
+{/if}
+{/foreach}
+        </internal>
+        <internal index="5">
+{foreach $keys["line"] as $row}
+{if $row.device_key_id > 48 && $row.device_key_id <= 62}
+            <Fkey index="{$row.device_key_id-48}">
+                <Type>{if $row.device_key_type == 3}0{elseif $row.device_key_type == 1}2{else}1{/if}</Type>
+                <Value>{if $row.device_key_type == 3}{elseif $row.device_key_type == 1}SIP{$row.device_key_line}{else}{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}{/if}</Value>
+                <Title>{$row.device_key_label}</Title>
+                <ICON>{$row.device_key_icon}</ICON>
+            </Fkey>
+{/if}
+{/foreach}
+        </internal>        
+        
         <internal index="1">
 {foreach $keys["memory"] as $row}
 {if $row.device_key_id <= 12}