From 3ccb7130aa9da63396865ae5a8bde541f6c6a5e7 Mon Sep 17 00:00:00 2001
From: danry25 <adn5412@gmail.com>
Date: Sun, 26 Aug 2018 12:04:13 -0700
Subject: [PATCH] Wired up configurable firmware versions for Grandstream
 Devices (#3284)

* Added the ability to pick the SIP account for the first two slots on each handset

* Revert to clean base

* Configurable firmware versions for Grandstream Devices

* Cleaned up duplicate P codes in gxv3504 prov, and spacing elsewhere

Updated or added configurable firmware versions to the remaining Grandstream configs

* Documented how to use the firmware version feature

* Formatting fix in Readme
---
 .../templates/provision/grandstream/README.md  | 18 ++++++++++++++++++
 .../provision/grandstream/dp715.sm/{$mac}.xml  |  8 +++++++-
 .../provision/grandstream/dp715/{$mac}.xml     |  8 +++++---
 .../provision/grandstream/dp750/{$mac}.xml     |  6 ++++--
 .../provision/grandstream/gxp110x/{$mac}.xml   |  6 ++++--
 .../provision/grandstream/gxp116x/{$mac}.xml   |  6 ++++--
 .../provision/grandstream/gxp140x/{$mac}.xml   | 14 ++++++++------
 .../provision/grandstream/gxp140xbk/{$mac}.xml | 14 ++++++++------
 .../provision/grandstream/gxp1450/{$mac}.xml   |  6 ++++--
 .../provision/grandstream/gxp1450bk/{$mac}.xml |  6 ++++--
 .../provision/grandstream/gxp16xx/{$mac}.xml   |  9 +++++----
 .../provision/grandstream/gxp17xx/{$mac}.xml   |  8 +++++---
 .../provision/grandstream/gxp20xx/{$mac}.xml   |  6 ++++--
 .../provision/grandstream/gxp2124/{$mac}.xml   | 12 +++++++-----
 .../provision/grandstream/gxp2130/{$mac}.xml   |  6 ++++--
 .../provision/grandstream/gxp2135/{$mac}.xml   |  6 ++++--
 .../provision/grandstream/gxp2140/{$mac}.xml   |  6 ++++--
 .../provision/grandstream/gxp2160/{$mac}.xml   |  6 ++++--
 .../provision/grandstream/gxp2170/{$mac}.xml   |  6 ++++--
 .../provision/grandstream/gxp21xx/{$mac}.xml   |  6 ++++++
 .../provision/grandstream/gxp21xxbk/{$mac}.xml |  7 ++++---
 .../provision/grandstream/gxp2200/{$mac}.xml   |  8 +++++---
 .../provision/grandstream/gxp3240/{$mac}.xml   |  7 ++++---
 .../provision/grandstream/gxv300x/{$mac}.xml   |  9 +++++----
 .../provision/grandstream/gxv3140/{$mac}.xml   |  7 ++++---
 .../provision/grandstream/gxv3175/{$mac}.xml   |  9 +++++----
 .../provision/grandstream/gxv3175v2/{$mac}.xml | 16 +++++++++-------
 .../provision/grandstream/gxv3240/{$mac}.xml   |  8 +++++---
 .../provision/grandstream/gxv3275/{$mac}.xml   |  6 ++++--
 .../provision/grandstream/gxv3504/{$mac}.xml   | 16 ++++------------
 .../provision/grandstream/gxw4004/{$mac}.xml   |  8 ++++++++
 .../provision/grandstream/gxw4008/{$mac}.xml   |  8 ++++++++
 .../provision/grandstream/gxw40xx/{$mac}.xml   |  7 +++++--
 .../provision/grandstream/gxw410x/{$mac}.xml   |  7 +++++--
 .../provision/grandstream/gxw42xx/{$mac}.xml   |  7 +++++--
 .../provision/grandstream/ht502/{$mac}.xml     | 13 ++++++++-----
 .../provision/grandstream/ht503/{$mac}.xml     |  7 +++++--
 .../provision/grandstream/ht701/{$mac}.xml     |  7 ++++---
 .../provision/grandstream/ht702/{$mac}.xml     |  8 ++++++--
 .../provision/grandstream/ht704/{$mac}.xml     |  6 ++++--
 40 files changed, 220 insertions(+), 114 deletions(-)
 create mode 100644 resources/templates/provision/grandstream/README.md

diff --git a/resources/templates/provision/grandstream/README.md b/resources/templates/provision/grandstream/README.md
new file mode 100644
index 0000000000..04bff74428
--- /dev/null
+++ b/resources/templates/provision/grandstream/README.md
@@ -0,0 +1,18 @@
+Device Specific Firmware Versions
+======================
+Select Grandstream phones (particularly the GXP2140 and similar) need firmware upgrades in a certain order.
+Grandstream also offers beta firmware quite often, which you may want to test on only some devices.
+
+We've attempted to make the process of changing firmware easier, by serving a phone with the firmware specified in a field called
+Firmware under Accounts => Devices then click on the MAC address of the relevant device, filling in said field.
+
+To use configurable firmware locations, enable device_firmware for the superadmin group under Advanced => Group Manager, set the
+URL for grandstream_firmware_path under Advanced => Default Variables and set Enabled to True for grandstream_firmware_path.
+
+We would suggest creating a folder called firmware on the webserver that you host the firmware on, setting grandstream_firmware_path
+to the full URL (excluding the protocol - leave off the `http://`) for example `mydomain.com/firmware` or `mydomain.com/firmware/grandstream`
+if you are hosting multiple different vendors firmware images. When a device goes to hit this server, it will attempt to load
+`<grandstream_firmware_path>/<device model>/<firmware version>/<firmware file>`, or `mydomain.com/firmware/gxp2140/1.0.9.69/gxp2140fw.bin`
+in our case, assuming we have a Grandstream GXP2140 phone and we are feeding it firmware version 1.0.9.69. For Grandstream phones,
+the firmware filename is relatively static, and the files Grandstream distributes are generally named correctly for their phones
+to download.
diff --git a/resources/templates/provision/grandstream/dp715.sm/{$mac}.xml b/resources/templates/provision/grandstream/dp715.sm/{$mac}.xml
index 4e0f2a53c8..b8e220d738 100644
--- a/resources/templates/provision/grandstream/dp715.sm/{$mac}.xml
+++ b/resources/templates/provision/grandstream/dp715.sm/{$mac}.xml
@@ -67,7 +67,13 @@
 <P212>2</P212>
 
 <!-- Firmware Server Path -->
-<P192>{domain_name}/firmware/gs</P192>
+{if isset($grandstream_firmware_path) && isset($firmware_version)}
+<P192>{$grandstream_firmware_path}/dp715/{$firmware_version}</P192>
+{elseif isset($grandstream_firmware_path)}
+<P192>{$grandstream_firmware_path}/dp715</P192>
+{else}
+<P192>{$domain_name}{$project_path}/app/provision</P192>
+{/if}
 
 <!-- Config Server Path -->
 <P237>{$domain_name}{$project_path}/app/provision</P237>
diff --git a/resources/templates/provision/grandstream/dp715/{$mac}.xml b/resources/templates/provision/grandstream/dp715/{$mac}.xml
index 1e5e44e9d7..a3b5f34e6a 100644
--- a/resources/templates/provision/grandstream/dp715/{$mac}.xml
+++ b/resources/templates/provision/grandstream/dp715/{$mac}.xml
@@ -29,12 +29,14 @@
 		<P212>1</P212>
 		<!-- Firmware Server Path -->
 	
-		{if isset($grandstream_firmware_path)}
-		<P192>{$grandstream_firmware_path}</P192>
+		{if isset($grandstream_firmware_path) && isset($firmware_version)}
+		<P192>{$grandstream_firmware_path}/dp715/{$firmware_version}</P192>
+		{elseif isset($grandstream_firmware_path)}
+		<P192>{$grandstream_firmware_path}/dp715</P192>
 		{else}
 		<P192>{$domain_name}{$project_path}/app/provision</P192>
 		{/if}
-	
+
 		<!-- Config Server Path -->
 		<P237>{$domain_name}{$project_path}/app/provision</P237>
 		<!-- XML Config File Password -->
diff --git a/resources/templates/provision/grandstream/dp750/{$mac}.xml b/resources/templates/provision/grandstream/dp750/{$mac}.xml
index da63c57dce..2bd2134cb5 100644
--- a/resources/templates/provision/grandstream/dp750/{$mac}.xml
+++ b/resources/templates/provision/grandstream/dp750/{$mac}.xml
@@ -2571,8 +2571,10 @@
 
 <!-- Firmware Server Path -->
 <!-- String: serveraddress  -->
-{if isset($grandstream_firmware_path)}
-<P192>{$grandstream_firmware_path}</P192>
+{if isset($grandstream_firmware_path) && isset($firmware_version)}
+<P192>{$grandstream_firmware_path}/dp750/{$firmware_version}</P192>
+{elseif isset($grandstream_firmware_path)}
+<P192>{$grandstream_firmware_path}/dp750</P192>
 {else}
 <P192>{$domain_name}{$project_path}/app/provision</P192>
 {/if}
diff --git a/resources/templates/provision/grandstream/gxp110x/{$mac}.xml b/resources/templates/provision/grandstream/gxp110x/{$mac}.xml
index b0ad49c720..386d60857b 100644
--- a/resources/templates/provision/grandstream/gxp110x/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp110x/{$mac}.xml
@@ -921,8 +921,10 @@
 
 <!-- Firmware Server Path -->
 <!-- String -->
-{if isset($grandstream_firmware_path)}
-<P192>{$grandstream_firmware_path}</P192>
+{if isset($grandstream_firmware_path) && isset($firmware_version)}
+<P192>{$grandstream_firmware_path}/gxp110x/{$firmware_version}</P192>
+{elseif isset($grandstream_firmware_path)}
+<P192>{$grandstream_firmware_path}/gxp110x</P192>
 {else}
 <P192>{$domain_name}{$project_path}/app/provision</P192>
 {/if}
diff --git a/resources/templates/provision/grandstream/gxp116x/{$mac}.xml b/resources/templates/provision/grandstream/gxp116x/{$mac}.xml
index 53d1a7256f..57899cfd3a 100644
--- a/resources/templates/provision/grandstream/gxp116x/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp116x/{$mac}.xml
@@ -795,8 +795,10 @@
 
 <!--  Firmware Server Path -->
 <!--  String -->
-{if isset($grandstream_firmware_path)}
-<P192>{$grandstream_firmware_path}</P192>
+{if isset($grandstream_firmware_path) && isset($firmware_version)}
+<P192>{$grandstream_firmware_path}/gxp116x/{$firmware_version}</P192>
+{elseif isset($grandstream_firmware_path)}
+<P192>{$grandstream_firmware_path}/gxp116x</P192>
 {else}
 <P192>{$domain_name}{$project_path}/app/provision</P192>
 {/if}
diff --git a/resources/templates/provision/grandstream/gxp140x/{$mac}.xml b/resources/templates/provision/grandstream/gxp140x/{$mac}.xml
index b537f01a8b..2895aa78f0 100644
--- a/resources/templates/provision/grandstream/gxp140x/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp140x/{$mac}.xml
@@ -1165,13 +1165,15 @@
     <P212>2</P212>
     <!--  Firmware Server Path -->
     <!--  String -->
-    
-    {if isset($grandstream_firmware_path)}
-    <P192>{$grandstream_firmware_path}</P192>
+
+    {if isset($grandstream_firmware_path) && isset($firmware_version)}
+    <P192>{$grandstream_firmware_path}/gxp140x/{$firmware_version}</P192>
+    {elseif isset($grandstream_firmware_path)}
+    <P192>{$grandstream_firmware_path}/gxp140x</P192>
     {else}
     <P192>{$domain_name}{$project_path}/app/provision</P192>
     {/if}
-    
+
     <!--  Config Server Path -->
     <!--  String -->
     <P237>{$domain_name}{$project_path}/app/provision</P237>
@@ -1313,7 +1315,7 @@
     <!--  This is a string of up to 256 characters that should contain a path to the XML file. It MUST be in the host/path format. -->
     <!--  For example: directory.grandstream.com/engineering -->
     <!--  String -->
-    
+
     {if isset($contact_grandstream)}
 <P331>{$grandstream_phonebook_xml_server_path}{$mac}/</P331>
 {elseif isset($grandstream_phonebook_xml_server_path)}
@@ -1321,7 +1323,7 @@
 {else}
 <P331></P331>
 {/if}
-    
+
     <!--  Phonebook Download Interval (in minutes) -->
     <!--  Valid value range is 5-720. Default is 0 for disabled -->
     <!--  Number: 0, 5-720;  -->
diff --git a/resources/templates/provision/grandstream/gxp140xbk/{$mac}.xml b/resources/templates/provision/grandstream/gxp140xbk/{$mac}.xml
index 4c61bc0013..28be7a76ab 100644
--- a/resources/templates/provision/grandstream/gxp140xbk/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp140xbk/{$mac}.xml
@@ -1165,13 +1165,15 @@
     <P212>2</P212>
     <!--  Firmware Server Path -->
     <!--  String -->
-    
-    {if isset($grandstream_firmware_path)}
-    <P192>{$grandstream_firmware_path}</P192>
+
+    {if isset($grandstream_firmware_path) && isset($firmware_version)}
+    <P192>{$grandstream_firmware_path}/gxp140x/{$firmware_version}</P192>
+    {elseif isset($grandstream_firmware_path)}
+    <P192>{$grandstream_firmware_path}/gxp140x</P192>
     {else}
     <P192>{$domain_name}{$project_path}/app/provision</P192>
     {/if}
-    
+
     <!--  Config Server Path -->
     <!--  String -->
     <P237>{$domain_name}{$project_path}/app/provision</P237>
@@ -1313,7 +1315,7 @@
     <!--  This is a string of up to 256 characters that should contain a path to the XML file. It MUST be in the host/path format. -->
     <!--  For example: directory.grandstream.com/engineering -->
     <!--  String -->
-    
+
     {if isset($contact_grandstream)}
 <P331>{$grandstream_phonebook_xml_server_path}{$mac}/</P331>
 {elseif isset($grandstream_phonebook_xml_server_path)}
@@ -1321,7 +1323,7 @@
 {else}
 <P331></P331>
 {/if}
-    
+
     <!--  Phonebook Download Interval (in minutes) -->
     <!--  Valid value range is 5-720. Default is 0 for disabled -->
     <!--  Number: 0, 5-720;  -->
diff --git a/resources/templates/provision/grandstream/gxp1450/{$mac}.xml b/resources/templates/provision/grandstream/gxp1450/{$mac}.xml
index 1d9f08d457..7638e750bd 100644
--- a/resources/templates/provision/grandstream/gxp1450/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp1450/{$mac}.xml
@@ -1550,8 +1550,10 @@
 
 <!-- Firmware Server Path -->
 <!-- String -->
-{if isset($grandstream_firmware_path)}
-<P192>{$grandstream_firmware_path}</P192>
+{if isset($grandstream_firmware_path) && isset($firmware_version)}
+<P192>{$grandstream_firmware_path}/gxp1450/{$firmware_version}</P192>
+{elseif isset($grandstream_firmware_path)}
+<P192>{$grandstream_firmware_path}/gxp1450</P192>
 {else}
 <P192>{$domain_name}{$project_path}/app/provision</P192>
 {/if}
diff --git a/resources/templates/provision/grandstream/gxp1450bk/{$mac}.xml b/resources/templates/provision/grandstream/gxp1450bk/{$mac}.xml
index 033c52e9f8..e8e4cb2460 100644
--- a/resources/templates/provision/grandstream/gxp1450bk/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp1450bk/{$mac}.xml
@@ -1357,8 +1357,10 @@
 <!-- Mandatory -->
 <P212>2</P212>
 
-{if isset($grandstream_firmware_path)}
-<P192>{$grandstream_firmware_path}</P192>
+{if isset($grandstream_firmware_path) && isset($firmware_version)}
+<P192>{$grandstream_firmware_path}/gxp1450/{$firmware_version}</P192>
+{elseif isset($grandstream_firmware_path)}
+<P192>{$grandstream_firmware_path}/gxp1450</P192>
 {else}
 <P192>{$domain_name}{$project_path}/app/provision</P192>
 {/if}
diff --git a/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml b/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml
index 24113aa9e4..f7863c0c53 100644
--- a/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml
@@ -1199,7 +1199,7 @@
 <!--  Name -->
 <!--  String -->
 <P507>{$display_name_3}</P507>
-	
+
 <!--  Voice Mail UserID -->
 <!--  String -->
 <P526>*97</P526>
@@ -2045,8 +2045,10 @@
 <P6767>2</P6767>
 <!--  Firmware Server Path -->
 <!--  String -->
-{if isset($grandstream_firmware_path)}
-<P192>{$grandstream_firmware_path}</P192>
+{if isset($grandstream_firmware_path) && isset($firmware_version)}
+<P192>{$grandstream_firmware_path}/gxp16xx/{$firmware_version}</P192>
+{elseif isset($grandstream_firmware_path)}
+<P192>{$grandstream_firmware_path}/gxp16xx</P192>
 {else}
 <P192>{$domain_name}{$project_path}/app/provision</P192>
 {/if}
@@ -3048,4 +3050,3 @@
 <P2986></P2986>
 </config>
 </gs_provision>
-
diff --git a/resources/templates/provision/grandstream/gxp17xx/{$mac}.xml b/resources/templates/provision/grandstream/gxp17xx/{$mac}.xml
index 602e9fe516..bad289db43 100644
--- a/resources/templates/provision/grandstream/gxp17xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp17xx/{$mac}.xml
@@ -6057,9 +6057,11 @@
 
 <!-- # Firmware Server Path -->
 <!-- # String -->
-    
-{if isset($grandstream_firmware_path)}
-<P192>{$grandstream_firmware_path}</P192>
+
+{if isset($grandstream_firmware_path) && isset($firmware_version)}
+<P192>{$grandstream_firmware_path}/gxp17xx/{$firmware_version}</P192>
+{elseif isset($grandstream_firmware_path)}
+<P192>{$grandstream_firmware_path}/gxp17xx</P192>
 {else}
 <P192>{$domain_name}{$project_path}/app/provision</P192>
 {/if}
diff --git a/resources/templates/provision/grandstream/gxp20xx/{$mac}.xml b/resources/templates/provision/grandstream/gxp20xx/{$mac}.xml
index b19be232bf..8f06c8d761 100644
--- a/resources/templates/provision/grandstream/gxp20xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp20xx/{$mac}.xml
@@ -72,8 +72,10 @@
 
 <!--  Firmware Server Path -->
 
-{if isset($grandstream_firmware_path)}
-<P192>{$grandstream_firmware_path}</P192>
+{if isset($grandstream_firmware_path) && isset($firmware_version)}
+<P192>{$grandstream_firmware_path}/gxp20xx/{$firmware_version}</P192>
+{elseif isset($grandstream_firmware_path)}
+<P192>{$grandstream_firmware_path}/gxp20xx</P192>
 {else}
 <P192>{$domain_name}{$project_path}/app/provision</P192>
 {/if}
diff --git a/resources/templates/provision/grandstream/gxp2124/{$mac}.xml b/resources/templates/provision/grandstream/gxp2124/{$mac}.xml
index 5cc4c6d7df..c9b376f786 100644
--- a/resources/templates/provision/grandstream/gxp2124/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2124/{$mac}.xml
@@ -1904,13 +1904,15 @@
     <P212>2</P212>
     <!-- Firmware Server Path -->
     <!-- String -->
-    
-    {if isset($grandstream_firmware_path)}
-    <P192>{$grandstream_firmware_path}</P192>
+
+    {if isset($grandstream_firmware_path) && isset($firmware_version)}
+    <P192>{$grandstream_firmware_path}/gxp2124/{$firmware_version}</P192>
+    {elseif isset($grandstream_firmware_path)}
+    <P192>{$grandstream_firmware_path}/gxp2124</P192>
     {else}
     <P192>{$domain_name}{$project_path}/app/provision</P192>
     {/if}
-    
+
     <!-- Config Server Path -->
     <!-- String -->
     <P237>{$domain_name}{$project_path}/app/provision</P237>
@@ -2052,7 +2054,7 @@
     <!-- This is a string of up to 256 characters that should contain a path to the XML file. It MUST be in the host/path format. -->
     <!-- For example: directory.grandstream.com/engineering -->
     <!-- String -->
-    
+
     {if isset($contact_grandstream)}
 <P331>{$grandstream_phonebook_xml_server_path}{$mac}/</P331>
 {elseif isset($grandstream_phonebook_xml_server_path)}
diff --git a/resources/templates/provision/grandstream/gxp2130/{$mac}.xml b/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
index f5819b05fd..200d3a7385 100644
--- a/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
@@ -4870,8 +4870,10 @@
 
 <!--  Firmware Server Path Default fm.grandstream.com/gs -->
 <!--  String -->
-{if isset($grandstream_firmware_path)}
-<P192>{$grandstream_firmware_path}</P192>
+{if isset($grandstream_firmware_path) && isset($firmware_version)}
+<P192>{$grandstream_firmware_path}/gxp2130/{$firmware_version}</P192>
+{elseif isset($grandstream_firmware_path)}
+<P192>{$grandstream_firmware_path}/gxp2130</P192>
 {else}
 <P192>{$domain_name}{$project_path}/app/provision</P192>
 {/if}
diff --git a/resources/templates/provision/grandstream/gxp2135/{$mac}.xml b/resources/templates/provision/grandstream/gxp2135/{$mac}.xml
index 66475e6f19..3df3e2010a 100644
--- a/resources/templates/provision/grandstream/gxp2135/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2135/{$mac}.xml
@@ -4870,8 +4870,10 @@
 
 <!--  Firmware Server Path Default fm.grandstream.com/gs -->
 <!--  String -->
-{if isset($grandstream_firmware_path)}
-<P192>{$grandstream_firmware_path}</P192>
+{if isset($grandstream_firmware_path) && isset($firmware_version)}
+<P192>{$grandstream_firmware_path}/gxp2135/{$firmware_version}</P192>
+{elseif isset($grandstream_firmware_path)}
+<P192>{$grandstream_firmware_path}/gxp2135</P192>
 {else}
 <P192>{$domain_name}{$project_path}/app/provision</P192>
 {/if}
diff --git a/resources/templates/provision/grandstream/gxp2140/{$mac}.xml b/resources/templates/provision/grandstream/gxp2140/{$mac}.xml
index fbb6884712..6f8c0c3c28 100644
--- a/resources/templates/provision/grandstream/gxp2140/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2140/{$mac}.xml
@@ -4870,8 +4870,10 @@
 
 <!--  Firmware Server Path Default fm.grandstream.com/gs -->
 <!--  String -->
-{if isset($grandstream_firmware_path)}
-<P192>{$grandstream_firmware_path}</P192>
+{if isset($grandstream_firmware_path) && isset($firmware_version)}
+<P192>{$grandstream_firmware_path}/gxp2140/{$firmware_version}</P192>
+{elseif isset($grandstream_firmware_path)}
+<P192>{$grandstream_firmware_path}/gxp2140</P192>
 {else}
 <P192>{$domain_name}{$project_path}/app/provision</P192>
 {/if}
diff --git a/resources/templates/provision/grandstream/gxp2160/{$mac}.xml b/resources/templates/provision/grandstream/gxp2160/{$mac}.xml
index cfab6db5b8..51ef6cbbe6 100644
--- a/resources/templates/provision/grandstream/gxp2160/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2160/{$mac}.xml
@@ -4870,8 +4870,10 @@
 
 <!--  Firmware Server Path Default fm.grandstream.com/gs -->
 <!--  String -->
-{if isset($grandstream_firmware_path)}
-<P192>{$grandstream_firmware_path}</P192>
+{if isset($grandstream_firmware_path) && isset($firmware_version)}
+<P192>{$grandstream_firmware_path}/gxp2160/{$firmware_version}</P192>
+{elseif isset($grandstream_firmware_path)}
+<P192>{$grandstream_firmware_path}/gxp2160</P192>
 {else}
 <P192>{$domain_name}{$project_path}/app/provision</P192>
 {/if}
diff --git a/resources/templates/provision/grandstream/gxp2170/{$mac}.xml b/resources/templates/provision/grandstream/gxp2170/{$mac}.xml
index 7c0b5833c5..6ab819f7bb 100644
--- a/resources/templates/provision/grandstream/gxp2170/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2170/{$mac}.xml
@@ -5514,8 +5514,10 @@
 
 <!-- # Firmware Server Path -->
 <!-- # String -->
-{if isset($grandstream_firmware_path)}
-<P192>{$grandstream_firmware_path}</P192>
+{if isset($grandstream_firmware_path) && isset($firmware_version)}
+<P192>{$grandstream_firmware_path}/gxp2170/{$firmware_version}</P192>
+{elseif isset($grandstream_firmware_path)}
+<P192>{$grandstream_firmware_path}/gxp2170</P192>
 {else}
 <P192>{$domain_name}{$project_path}/app/provision</P192>
 {/if}
diff --git a/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml b/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml
index eb8a5aca76..014c898cfc 100644
--- a/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml
@@ -2695,7 +2695,13 @@
     <!-- Firmware Server Path -->
     <!-- String -->
     <!--<P192>firmware.grandstream.com</P192>-->
+    {if isset($grandstream_firmware_path) && isset($firmware_version)}
+    <P192>{$grandstream_firmware_path}/gxp21xx/{$firmware_version}</P192>
+    {elseif isset($grandstream_firmware_path)}
+    <P192>{$grandstream_firmware_path}/gxp21xx</P192>
+    {else}
     <P192>{$domain_name}{$project_path}/app/provision</P192>
+    {/if}
     <!-- Config Server Path -->
     <!-- String -->
     <P237>{$domain_name}{$project_path}/app/provision</P237>
diff --git a/resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml b/resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml
index 208f231fce..aee52618af 100644
--- a/resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml
@@ -34,9 +34,10 @@
 
 <!-- Firmware Server Path -->
 <!-- String -->
-
-{if isset($grandstream_firmware_path)}
-<P192>{$grandstream_firmware_path}</P192>
+{if isset($grandstream_firmware_path) && isset($firmware_version)}
+<P192>{$grandstream_firmware_path}/gxp21xx/{$firmware_version}</P192>
+{elseif isset($grandstream_firmware_path)}
+<P192>{$grandstream_firmware_path}/gxp21xx</P192>
 {else}
 <P192>{$domain_name}{$project_path}/app/provision</P192>
 {/if}
diff --git a/resources/templates/provision/grandstream/gxp2200/{$mac}.xml b/resources/templates/provision/grandstream/gxp2200/{$mac}.xml
index ac29bc6e1e..19a4cec2bf 100644
--- a/resources/templates/provision/grandstream/gxp2200/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2200/{$mac}.xml
@@ -3213,9 +3213,11 @@ Account 5 Codec Settings
 <P212>2</P212>
 
 <!-- Firmware Server Path -->
-	
-{if isset($grandstream_firmware_path)}
-<P192>{$grandstream_firmware_path}</P192>
+
+{if isset($grandstream_firmware_path) && isset($firmware_version)}
+<P192>{$grandstream_firmware_path}/gxp2200/{$firmware_version}</P192>
+{elseif isset($grandstream_firmware_path)}
+<P192>{$grandstream_firmware_path}/gxp2200</P192>
 {else}
 <P192>{$domain_name}{$project_path}/app/provision</P192>
 {/if}
diff --git a/resources/templates/provision/grandstream/gxp3240/{$mac}.xml b/resources/templates/provision/grandstream/gxp3240/{$mac}.xml
index 9b543b57ff..81279cba42 100644
--- a/resources/templates/provision/grandstream/gxp3240/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp3240/{$mac}.xml
@@ -3213,9 +3213,10 @@ Account 5 Codec Settings
 <P212>2</P212>
 
 <!-- Firmware Server Path -->
-
-{if isset($grandstream_firmware_path)}
-<P192>{$grandstream_firmware_path}</P192>
+{if isset($grandstream_firmware_path) && isset($firmware_version)}
+<P192>{$grandstream_firmware_path}/gxp3240/{$firmware_version}</P192>
+{elseif isset($grandstream_firmware_path)}
+<P192>{$grandstream_firmware_path}/gxp3240</P192>
 {else}
 <P192>{$domain_name}{$project_path}/app/provision</P192>
 {/if}
diff --git a/resources/templates/provision/grandstream/gxv300x/{$mac}.xml b/resources/templates/provision/grandstream/gxv300x/{$mac}.xml
index b918c56b80..9293b1b67f 100644
--- a/resources/templates/provision/grandstream/gxv300x/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxv300x/{$mac}.xml
@@ -65,13 +65,14 @@
     <!-- Firmware Upgrade. 0 - TFTP Upgrade,  1 - HTTP Upgrade. -->
     <P212>1</P212>
     <!-- Firmware Server Path -->
-    
-    {if isset($grandstream_firmware_path)}
-    <P192>{$grandstream_firmware_path}</P192>
+    {if isset($grandstream_firmware_path) && isset($firmware_version)}
+    <P192>{$grandstream_firmware_path}/gxv300x/{$firmware_version}</P192>
+    {elseif isset($grandstream_firmware_path)}
+    <P192>{$grandstream_firmware_path}/gxv300x</P192>
     {else}
     <P192>{$domain_name}{$project_path}/app/provision</P192>
     {/if}
-    
+
     <!-- Config Server Path -->
     <P237>{$domain_name}{$project_path}/app/provision</P237>
     <!-- Firmware File Prefix -->
diff --git a/resources/templates/provision/grandstream/gxv3140/{$mac}.xml b/resources/templates/provision/grandstream/gxv3140/{$mac}.xml
index 46098c7e5f..f2f5968dd8 100644
--- a/resources/templates/provision/grandstream/gxv3140/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxv3140/{$mac}.xml
@@ -1372,9 +1372,10 @@
 <P1361>{$http_auth_password}</P1361>
 
 <!--  Firmware Server Path, MaxLength 128 -->
-
-{if isset($grandstream_firmware_path)}
-<P192>{$grandstream_firmware_path}</P192>
+{if isset($grandstream_firmware_path) && isset($firmware_version)}
+<P192>{$grandstream_firmware_path}/gxv3140/{$firmware_version}</P192>
+{elseif isset($grandstream_firmware_path)}
+<P192>{$grandstream_firmware_path}/gxv3140</P192>
 {else}
 <P192>{$domain_name}{$project_path}/app/provision</P192>
 {/if}
diff --git a/resources/templates/provision/grandstream/gxv3175/{$mac}.xml b/resources/templates/provision/grandstream/gxv3175/{$mac}.xml
index 993bf4f8b0..f6b161cf9a 100644
--- a/resources/templates/provision/grandstream/gxv3175/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxv3175/{$mac}.xml
@@ -1255,12 +1255,13 @@
 <P212>2</P212>
 
 <!-- Firmware Server Path, MaxLength 128 -->
-
-{if isset($grandstream_firmware_path)}
-<P192>{$grandstream_firmware_path}</P192>
+{if isset($grandstream_firmware_path) && isset($firmware_version)}
+<P192>{$grandstream_firmware_path}/gxv3175/{$firmware_version}</P192>
+{elseif isset($grandstream_firmware_path)}
+<P192>{$grandstream_firmware_path}/gxv3175</P192>
 {else}
 <P192>{$domain_name}{$project_path}/app/provision</P192>
-{/if}  
+{/if}
 
 <!-- Config Server Path, MaxLength 128 -->
 <P237>{$domain_name}{$project_path}/app/provision</P237>
diff --git a/resources/templates/provision/grandstream/gxv3175v2/{$mac}.xml b/resources/templates/provision/grandstream/gxv3175v2/{$mac}.xml
index 6481ce5c10..8093b0048e 100644
--- a/resources/templates/provision/grandstream/gxv3175v2/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxv3175v2/{$mac}.xml
@@ -736,7 +736,7 @@
     <P7070>1</P7070>
     <!-- Lock KeyPad UPdate. 0 - No, 1 - Yes -->
     <P88>0</P88>
-    
+
     <!-- XML Config File Password -->
     <!-- String; between ascii values 33 and 126 -->
     <!-- Mandatory -->
@@ -749,17 +749,19 @@
     <!--  HTTP/HTTPS Password -->
     <!--  String; between ascii values 33 and 126 -->
     <P1361>{$http_auth_password}</P1361>
-    
-    <!-- UPgrade Via: (0 - TFTP,1 - HTTP and 2 - HTTPS) -->
+
+    <!-- Upgrade Via: (0 - TFTP,1 - HTTP and 2 - HTTPS) -->
     <P212>2</P212>
+
     <!-- Firmware Server Path, MaxLength 128 -->
-    
-    {if isset($grandstream_firmware_path)}
-    <P192>{$grandstream_firmware_path}</P192>
+    {if isset($grandstream_firmware_path) && isset($firmware_version)}
+    <P192>{$grandstream_firmware_path}/gxv3175v2/{$firmware_version}</P192>
+    {elseif isset($grandstream_firmware_path)}
+    <P192>{$grandstream_firmware_path}/gxv3175v2</P192>
     {else}
     <P192>{$domain_name}{$project_path}/app/provision</P192>
     {/if}
-    
+
     <!-- Config Server Path, MaxLength 128 -->
     <P237>{$domain_name}{$project_path}/app/provision</P237>
     <!-- Firmware File Prefix, MaxLength 128 -->
diff --git a/resources/templates/provision/grandstream/gxv3240/{$mac}.xml b/resources/templates/provision/grandstream/gxv3240/{$mac}.xml
index 8a26fc6767..20bb22e7ab 100644
--- a/resources/templates/provision/grandstream/gxv3240/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxv3240/{$mac}.xml
@@ -1541,7 +1541,7 @@
 <!-- Check SIP User ID for Incoming INVITE. 0 - No, 1 - Yes. Default value is 0 -->
 <!-- Number: 0, 1 -->
 <P549>0</P549>
- 
+
 <!-- Authenticate Incoming INVITE. 0 - No, 1 - Yes. Default value is 0 -->
 <!-- Number: 0, 1 -->
 <P2546>0 </P2546>
@@ -4758,8 +4758,10 @@
 <P6767>1</P6767>
 
 <!-- Firmware Server Path -->
-{if isset($grandstream_firmware_path)}
-<P192>{$grandstream_firmware_path}</P192>
+{if isset($grandstream_firmware_path) && isset($firmware_version)}
+<P192>{$grandstream_firmware_path}/gxv3240/{$firmware_version}</P192>
+{elseif isset($grandstream_firmware_path)}
+<P192>{$grandstream_firmware_path}/gxv3240</P192>
 {else}
 <P192>{$domain_name}{$project_path}/app/provision</P192>
 {/if}
diff --git a/resources/templates/provision/grandstream/gxv3275/{$mac}.xml b/resources/templates/provision/grandstream/gxv3275/{$mac}.xml
index 26dcbaa350..365caa3635 100644
--- a/resources/templates/provision/grandstream/gxv3275/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxv3275/{$mac}.xml
@@ -3218,8 +3218,10 @@ Account 5 Codec Settings
 <!-- Config Server Path -->
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 
-{if isset($grandstream_firmware_path)}
-<P192>{$grandstream_firmware_path}</P192>
+{if isset($grandstream_firmware_path) && isset($firmware_version)}
+<P192>{$grandstream_firmware_path}/gxv3275/{$firmware_version}</P192>
+{elseif isset($grandstream_firmware_path)}
+<P192>{$grandstream_firmware_path}/gxv3275</P192>
 {else}
 <P192>{$domain_name}{$project_path}/app/provision</P192>
 {/if}
diff --git a/resources/templates/provision/grandstream/gxv3504/{$mac}.xml b/resources/templates/provision/grandstream/gxv3504/{$mac}.xml
index 322f465a58..4c5cafdd38 100644
--- a/resources/templates/provision/grandstream/gxv3504/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxv3504/{$mac}.xml
@@ -567,19 +567,15 @@
 <P212>2</P212>
 
 <!-- Firmware Server Path -->
-<P192>{domain_name}/firmware/gs</P192>
-
-<!-- Config Server Path -->
-<P237>{$domain_name}{$project_path}/app/provision</P237>
-
-{if isset($grandstream_firmware_path)}
-<P192>{$grandstream_firmware_path}</P192>
+{if isset($grandstream_firmware_path) && isset($firmware_version)}
+<P192>{$grandstream_firmware_path}/gxv3504/{$firmware_version}</P192>
+{elseif isset($grandstream_firmware_path)}
+<P192>{$grandstream_firmware_path}/gxv3504</P192>
 {else}
 <P192>{$domain_name}{$project_path}/app/provision</P192>
 {/if}
 
 <!-- Config Server Path  -->
-
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 
 <!-- XML Config File Password -->
@@ -1358,7 +1354,3 @@
 
 </config>
 </gs_provision>
-
-
-
-
diff --git a/resources/templates/provision/grandstream/gxw4004/{$mac}.xml b/resources/templates/provision/grandstream/gxw4004/{$mac}.xml
index 8b053e6bde..26c9858f11 100644
--- a/resources/templates/provision/grandstream/gxw4004/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxw4004/{$mac}.xml
@@ -12,6 +12,14 @@
 	<!-- Firmware Upgrade -->
 		<!-- Firmware Upgrade and Privisioning. 0 - TFTP Upgrade, 1 - HTTP Upgrade, 2 - HTTPS Upgrade., Number: 0 to 2. Mandatory -->
 		<P212>1</P212>
+		<!-- Firmware Server Path -->
+    {if isset($grandstream_firmware_path) && isset($firmware_version)}
+    <P192>{$grandstream_firmware_path}/gxw4004/{$firmware_version}</P192>
+    {elseif isset($grandstream_firmware_path)}
+    <P192>{$grandstream_firmware_path}/gxw4004</P192>
+    {else}
+    <P192>{$domain_name}{$project_path}/app/provision</P192>
+    {/if}
 		<!-- Config Server Path , String: serveraddress -->
 		<P237>{$domain_name}{$project_path}/app/provision</P237>
 
diff --git a/resources/templates/provision/grandstream/gxw4008/{$mac}.xml b/resources/templates/provision/grandstream/gxw4008/{$mac}.xml
index aa61d4a0ab..3eabe00740 100644
--- a/resources/templates/provision/grandstream/gxw4008/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxw4008/{$mac}.xml
@@ -12,6 +12,14 @@
 	<!-- Firmware Upgrade -->
 		<!-- Firmware Upgrade and Privisioning. 0 - TFTP Upgrade, 1 - HTTP Upgrade, 2 - HTTPS Upgrade., Number: 0 to 2. Mandatory -->
 		<P212>1</P212>
+		<!-- Firmware Server Path -->
+    {if isset($grandstream_firmware_path) && isset($firmware_version)}
+    <P192>{$grandstream_firmware_path}/gxw4008/{$firmware_version}</P192>
+    {elseif isset($grandstream_firmware_path)}
+    <P192>{$grandstream_firmware_path}/gxw4008</P192>
+    {else}
+    <P192>{$domain_name}{$project_path}/app/provision</P192>
+    {/if}
 		<!-- Config Server Path , String: serveraddress -->
 		<P237>{$domain_name}{$project_path}/app/provision</P237>
 
diff --git a/resources/templates/provision/grandstream/gxw40xx/{$mac}.xml b/resources/templates/provision/grandstream/gxw40xx/{$mac}.xml
index c42e205cab..e3465cac5a 100644
--- a/resources/templates/provision/grandstream/gxw40xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxw40xx/{$mac}.xml
@@ -49,8 +49,11 @@
     <!-- Number: 0 to 2 -->
     <!-- Mandatory -->
     <P212>2</P212>
-    {if isset($grandstream_firmware_path)}
-    <P192>{$grandstream_firmware_path}</P192>
+    <!-- Firmware Server Path -->
+    {if isset($grandstream_firmware_path) && isset($firmware_version)}
+    <P192>{$grandstream_firmware_path}/gxw40xx/{$firmware_version}</P192>
+    {elseif isset($grandstream_firmware_path)}
+    <P192>{$grandstream_firmware_path}/gxw40xx</P192>
     {else}
     <P192>{$domain_name}{$project_path}/app/provision</P192>
     {/if}
diff --git a/resources/templates/provision/grandstream/gxw410x/{$mac}.xml b/resources/templates/provision/grandstream/gxw410x/{$mac}.xml
index 4905d0ad57..cc24e39dfa 100644
--- a/resources/templates/provision/grandstream/gxw410x/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxw410x/{$mac}.xml
@@ -30,8 +30,11 @@
     <!--  Firmware Upgrade -->
     <!--  Firmware Upgrade. 0 - TFTP Upgrade,  1 - HTTP Upgrade. -->
     <P212>1</P212>
-    {if isset($grandstream_firmware_path)}
-    <P192>{$grandstream_firmware_path}</P192>
+    <!-- Firmware Server Path -->
+    {if isset($grandstream_firmware_path) && isset($firmware_version)}
+    <P192>{$grandstream_firmware_path}/gxw410x/{$firmware_version}</P192>
+    {elseif isset($grandstream_firmware_path)}
+    <P192>{$grandstream_firmware_path}/gxw410x</P192>
     {else}
     <P192>{$domain_name}{$project_path}/app/provision</P192>
     {/if}
diff --git a/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml b/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml
index c20e7422fd..d71bd76813 100644
--- a/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml
@@ -168,8 +168,11 @@
 <!-- Mandatory -->
 <P212>2</P212>
 
-{if isset($grandstream_firmware_path)}
-<P192>{$grandstream_firmware_path}</P192>
+<!-- Firmware Server Path -->
+{if isset($grandstream_firmware_path) && isset($firmware_version)}
+<P192>{$grandstream_firmware_path}/gxw40xx/{$firmware_version}</P192>
+{elseif isset($grandstream_firmware_path)}
+<P192>{$grandstream_firmware_path}/gxw40xx</P192>
 {else}
 <P192>{$domain_name}{$project_path}/app/provision</P192>
 {/if}
diff --git a/resources/templates/provision/grandstream/ht502/{$mac}.xml b/resources/templates/provision/grandstream/ht502/{$mac}.xml
index a36e13d687..a9886b42d1 100644
--- a/resources/templates/provision/grandstream/ht502/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht502/{$mac}.xml
@@ -39,11 +39,14 @@
 	<!-- Firmware Upgrade -->
 		<!-- Firmware Upgrade and Privisioning. 0 - TFTP Upgrade, 1 - HTTP Upgrade, 2 - HTTPS Upgrade. -->
 		<P212>2</P212>
-		{if isset($grandstream_firmware_path)}
-		<P192>{$grandstream_firmware_path}</P192>
-		{else}
-		<P192>{$domain_name}{$project_path}/app/provision</P192>
-		{/if}
+		<!-- Firmware Server Path -->
+    {if isset($grandstream_firmware_path) && isset($firmware_version)}
+    <P192>{$grandstream_firmware_path}/ht502/{$firmware_version}</P192>
+    {elseif isset($grandstream_firmware_path)}
+    <P192>{$grandstream_firmware_path}/ht502</P192>
+    {else}
+    <P192>{$domain_name}{$project_path}/app/provision</P192>
+    {/if}
 		<!-- Config Server Path. Server address -->
 		<P237>{$domain_name}{$project_path}/app/provision</P237>
 		<!-- XML Config File Password. Max Length: 40 characters; between ascii values 33 and 126 -->
diff --git a/resources/templates/provision/grandstream/ht503/{$mac}.xml b/resources/templates/provision/grandstream/ht503/{$mac}.xml
index 5c2fd06630..8593c9d593 100644
--- a/resources/templates/provision/grandstream/ht503/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht503/{$mac}.xml
@@ -136,8 +136,11 @@
 <!--  Mandatory -->
 <P212>2</P212>
 
-{if isset($grandstream_firmware_path)}
-<P192>{$grandstream_firmware_path}</P192>
+<!-- Firmware Server Path -->
+{if isset($grandstream_firmware_path) && isset($firmware_version)}
+<P192>{$grandstream_firmware_path}/ht503/{$firmware_version}</P192>
+{elseif isset($grandstream_firmware_path)}
+<P192>{$grandstream_firmware_path}/ht503</P192>
 {else}
 <P192>{$domain_name}{$project_path}/app/provision</P192>
 {/if}
diff --git a/resources/templates/provision/grandstream/ht701/{$mac}.xml b/resources/templates/provision/grandstream/ht701/{$mac}.xml
index 88ce52dabe..d967a15e90 100644
--- a/resources/templates/provision/grandstream/ht701/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht701/{$mac}.xml
@@ -61,9 +61,10 @@
 
 <!-- Firmware Server Path -->
 <!-- Server address -->
-
-{if isset($grandstream_firmware_path)}
-<P192>{$grandstream_firmware_path}</P192>
+{if isset($grandstream_firmware_path) && isset($firmware_version)}
+<P192>{$grandstream_firmware_path}/ht701/{$firmware_version}</P192>
+{elseif isset($grandstream_firmware_path)}
+<P192>{$grandstream_firmware_path}/ht701</P192>
 {else}
 <P192>{$domain_name}{$project_path}/app/provision</P192>
 {/if}
diff --git a/resources/templates/provision/grandstream/ht702/{$mac}.xml b/resources/templates/provision/grandstream/ht702/{$mac}.xml
index e65bcc0dcb..b9f987e5d2 100644
--- a/resources/templates/provision/grandstream/ht702/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht702/{$mac}.xml
@@ -70,8 +70,12 @@
 <!-- Mandatory -->
 <P212>2</P212>
 
-{if isset($grandstream_firmware_path)}
-<P192>{$grandstream_firmware_path}</P192>
+<!-- Firmware Server Path -->
+<!-- Server address -->
+{if isset($grandstream_firmware_path) && isset($firmware_version)}
+<P192>{$grandstream_firmware_path}/ht702/{$firmware_version}</P192>
+{elseif isset($grandstream_firmware_path)}
+<P192>{$grandstream_firmware_path}/ht702</P192>
 {else}
 <P192>{$domain_name}{$project_path}/app/provision</P192>
 {/if}
diff --git a/resources/templates/provision/grandstream/ht704/{$mac}.xml b/resources/templates/provision/grandstream/ht704/{$mac}.xml
index 14b34d0287..888526bd29 100644
--- a/resources/templates/provision/grandstream/ht704/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht704/{$mac}.xml
@@ -68,8 +68,10 @@
 <P212>2</P212>
 
 <!-- Firmware Server Path -->
-{if isset($grandstream_firmware_path)}
-<P192>{$grandstream_firmware_path}</P192>
+{if isset($grandstream_firmware_path) && isset($firmware_version)}
+<P192>{$grandstream_firmware_path}/ht704/{$firmware_version}</P192>
+{elseif isset($grandstream_firmware_path)}
+<P192>{$grandstream_firmware_path}/ht704</P192>
 {else}
 <P192>{$domain_name}{$project_path}/app/provision</P192>
 {/if}