diff --git a/resources/templates/provision/fanvil/x6/{$mac}.cfg b/resources/templates/provision/fanvil/x6/{$mac}.cfg
index 1b4e61d4f1..577cc12bca 100644
--- a/resources/templates/provision/fanvil/x6/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x6/{$mac}.cfg
@@ -150,10 +150,10 @@
             <SignalPort>5060</SignalPort>
                                  
             
-            {if $sip_transport_1 == 'udp'}<Transport>0{/if}</Transport>
-            {if $sip_transport_1 == 'tcp'}<Transport>1{/if}</Transport>
-            {if $sip_transport_1 == 'tls'}<Transport>2{/if}</Transport>
-            {if $sip_transport_1 == 'dns srv'}<Transport>3{/if}</Transport>
+            {if $sip_transport_1 == 'udp'}<Transport>0</Transport>{/if}
+            {if $sip_transport_1 == 'tcp'}<Transport>1</Transport>{/if}
+            {if $sip_transport_1 == 'tls'}<Transport>2</Transport>{/if}
+            {if $sip_transport_1 == 'dns srv'}<Transport>3</Transport>{/if}
             
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
@@ -292,10 +292,10 @@
             <SignalPort>5060</SignalPort>
                                  
            
-            {if $sip_transport_2 == 'udp'}<Transport>0{/if}</Transport>
-            {if $sip_transport_2 == 'tcp'}<Transport>1{/if}</Transport>
-            {if $sip_transport_2 == 'tls'}<Transport>2{/if}</Transport>
-            {if $sip_transport_2 == 'dns srv'}<Transport>3{/if}</Transport>
+            {if $sip_transport_2 == 'udp'}<Transport>0</Transport>{/if}
+            {if $sip_transport_2 == 'tcp'}<Transport>1</Transport>{/if}
+            {if $sip_transport_2 == 'tls'}<Transport>2</Transport>{/if}
+            {if $sip_transport_2 == 'dns srv'}<Transport>3</Transport>{/if}
             
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
@@ -434,10 +434,10 @@
             <SignalPort>5060</SignalPort>
                                  
            
-            {if $sip_transport_3 == 'udp'}<Transport>0{/if}</Transport>
-            {if $sip_transport_3 == 'tcp'}<Transport>1{/if}</Transport>
-            {if $sip_transport_3 == 'tls'}<Transport>2{/if}</Transport>
-            {if $sip_transport_3 == 'dns srv'}<Transport>3{/if}</Transport>
+            {if $sip_transport_3 == 'udp'}<Transport>0</Transport>{/if}
+            {if $sip_transport_3 == 'tcp'}<Transport>1</Transport>{/if}
+            {if $sip_transport_3 == 'tls'}<Transport>2</Transport>{/if}
+            {if $sip_transport_3 == 'dns srv'}<Transport>3</Transport>{/if}
             
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
@@ -577,10 +577,10 @@
             <PhonePort>0</PhonePort>
             <SignalPort>5060</SignalPort>
            
-            {if $sip_transport_4 == 'udp'}<Transport>0{/if}</Transport>
-            {if $sip_transport_4 == 'tcp'}<Transport>1{/if}</Transport>
-            {if $sip_transport_4 == 'tls'}<Transport>2{/if}</Transport>
-            {if $sip_transport_4 == 'dns srv'}<Transport>3{/if}</Transport>
+            {if $sip_transport_4 == 'udp'}<Transport>0</Transport>{/if}
+            {if $sip_transport_4 == 'tcp'}<Transport>1</Transport>{/if}
+            {if $sip_transport_4 == 'tls'}<Transport>2</Transport>{/if}
+            {if $sip_transport_4 == 'dns srv'}<Transport>3</Transport>{/if}
             
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
@@ -719,10 +719,10 @@
             <SignalPort>5060</SignalPort>
                                  
             
-            {if $sip_transport_5 == 'udp'}<Transport>0{/if}</Transport>
-            {if $sip_transport_5 == 'tcp'}<Transport>1{/if}</Transport>
-            {if $sip_transport_5 == 'tls'}<Transport>2{/if}</Transport>
-            {if $sip_transport_5 == 'dns srv'}<Transport>3{/if}</Transport>
+            {if $sip_transport_5 == 'udp'}<Transport>0</Transport>{/if}
+            {if $sip_transport_5 == 'tcp'}<Transport>1</Transport>{/if}
+            {if $sip_transport_5 == 'tls'}<Transport>2</Transport>{/if}
+            {if $sip_transport_5 == 'dns srv'}<Transport>3</Transport>{/if}
             
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
@@ -861,10 +861,10 @@
             <SignalPort>5060</SignalPort>
                                  
             
-            {if $sip_transport_6 == 'udp'}<Transport>0{/if}</Transport>
-            {if $sip_transport_6 == 'tcp'}<Transport>1{/if}</Transport>
-            {if $sip_transport_6 == 'tls'}<Transport>2{/if}</Transport>
-            {if $sip_transport_6 == 'dns srv'}<Transport>3{/if}</Transport>
+            {if $sip_transport_6 == 'udp'}<Transport>0</Transport>{/if}
+            {if $sip_transport_6 == 'tcp'}<Transport>1</Transport>{/if}
+            {if $sip_transport_6 == 'tls'}<Transport>2</Transport>{/if}
+            {if $sip_transport_6 == 'dns srv'}<Transport>3</Transport>{/if}
             
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
@@ -1532,8 +1532,8 @@
         <TLSVersion>0</TLSVersion>
         <AreaCode>020</AreaCode>
         <STUNEnable>0</STUNEnable>
-        <STUNServerAddr></STUNServerAddr>
-        <STUNServerPort>3478</STUNServerPort>
+        <STUNServerAddr>{$fanvil_stun_server}</STUNServerAddr>
+        <STUNServerPort>{$fanvil_stun_port}</STUNServerPort>
         <STUNLocalPort>30000</STUNLocalPort>
     </tr069>
     <hotspot>