diff --git a/resources/templates/provision/grandstream/dp715.sm/{$mac}.xml b/resources/templates/provision/grandstream/dp715.sm/{$mac}.xml
index 9735e579f3..4fd8b5ca92 100644
--- a/resources/templates/provision/grandstream/dp715.sm/{$mac}.xml
+++ b/resources/templates/provision/grandstream/dp715.sm/{$mac}.xml
@@ -162,10 +162,10 @@
300
-
+{$mac|replace:'-':''|upper}
-
+{$mac|replace:'-':''|upper}
diff --git a/resources/templates/provision/grandstream/dp715/{$mac}.xml b/resources/templates/provision/grandstream/dp715/{$mac}.xml
index 9574eb0d12..e1a4c36f52 100644
--- a/resources/templates/provision/grandstream/dp715/{$mac}.xml
+++ b/resources/templates/provision/grandstream/dp715/{$mac}.xml
@@ -101,9 +101,9 @@
300
-
+ {$mac|replace:'-':''|upper}
-
+ {$mac|replace:'-':''|upper}
diff --git a/resources/templates/provision/grandstream/gac2500/{$mac}.xml b/resources/templates/provision/grandstream/gac2500/{$mac}.xml
index 2f626be56e..937cbfa077 100644
--- a/resources/templates/provision/grandstream/gac2500/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gac2500/{$mac}.xml
@@ -4548,10 +4548,10 @@
86400
-
+ {$mac|replace:'-':''|upper}
-
+ {$mac|replace:'-':''|upper}
diff --git a/resources/templates/provision/grandstream/grp26xx/{$mac}.xml b/resources/templates/provision/grandstream/grp26xx/{$mac}.xml
index 3f2f3b02f2..330a070022 100644
--- a/resources/templates/provision/grandstream/grp26xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp26xx/{$mac}.xml
@@ -5959,11 +5959,11 @@
-
+ {$mac|replace:'-':''|upper}
-
+ {$mac|replace:'-':''|upper}
diff --git a/resources/templates/provision/grandstream/gxp110x/{$mac}.xml b/resources/templates/provision/grandstream/gxp110x/{$mac}.xml
index ce830c4975..a0951499a9 100644
--- a/resources/templates/provision/grandstream/gxp110x/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp110x/{$mac}.xml
@@ -1073,11 +1073,11 @@
-
+{$mac|replace:'-':''|upper}
-
+{$mac|replace:'-':''|upper}
diff --git a/resources/templates/provision/grandstream/gxp116x/{$mac}.xml b/resources/templates/provision/grandstream/gxp116x/{$mac}.xml
index 728d0b347d..99f5aa2293 100644
--- a/resources/templates/provision/grandstream/gxp116x/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp116x/{$mac}.xml
@@ -949,11 +949,11 @@
-
+{$mac|replace:'-':''|upper}
-
+{$mac|replace:'-':''|upper}
diff --git a/resources/templates/provision/grandstream/gxp140x/{$mac}.xml b/resources/templates/provision/grandstream/gxp140x/{$mac}.xml
index d4f8f96780..d571022235 100644
--- a/resources/templates/provision/grandstream/gxp140x/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp140x/{$mac}.xml
@@ -1292,10 +1292,10 @@
86400
-
+ {$mac|replace:'-':''|upper}
-
+ {$mac|replace:'-':''|upper}
0
diff --git a/resources/templates/provision/grandstream/gxp140xbk/{$mac}.xml b/resources/templates/provision/grandstream/gxp140xbk/{$mac}.xml
index 358d12b978..132223450a 100644
--- a/resources/templates/provision/grandstream/gxp140xbk/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp140xbk/{$mac}.xml
@@ -1292,10 +1292,10 @@
86400
-
+ {$mac|replace:'-':''|upper}
-
+ {$mac|replace:'-':''|upper}
0
diff --git a/resources/templates/provision/grandstream/gxp1450/{$mac}.xml b/resources/templates/provision/grandstream/gxp1450/{$mac}.xml
index bb2abf7ce0..2330d502a9 100644
--- a/resources/templates/provision/grandstream/gxp1450/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp1450/{$mac}.xml
@@ -1704,11 +1704,11 @@
-
+{$mac|replace:'-':''|upper}
-
+{$mac|replace:'-':''|upper}
diff --git a/resources/templates/provision/grandstream/gxp1450bk/{$mac}.xml b/resources/templates/provision/grandstream/gxp1450bk/{$mac}.xml
index c3d21d0264..c58fa8758e 100644
--- a/resources/templates/provision/grandstream/gxp1450bk/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp1450bk/{$mac}.xml
@@ -1511,11 +1511,11 @@
-
+{$mac|replace:'-':''|upper}
-
+{$mac|replace:'-':''|upper}
diff --git a/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml b/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml
index 4b07d7e041..f9a78d0330 100644
--- a/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml
@@ -2270,10 +2270,10 @@
86400
-
+{$mac|replace:'-':''|upper}
-
+{$mac|replace:'-':''|upper}
7547
diff --git a/resources/templates/provision/grandstream/gxp17xx/{$mac}.xml b/resources/templates/provision/grandstream/gxp17xx/{$mac}.xml
index b964ecd666..51be279db8 100644
--- a/resources/templates/provision/grandstream/gxp17xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp17xx/{$mac}.xml
@@ -6299,11 +6299,11 @@
-
+{$mac|replace:'-':''|upper}
-
+{$mac|replace:'-':''|upper}
diff --git a/resources/templates/provision/grandstream/gxp2100/{$mac}.xml b/resources/templates/provision/grandstream/gxp2100/{$mac}.xml
index 48e5216ac2..733561aab4 100644
--- a/resources/templates/provision/grandstream/gxp2100/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2100/{$mac}.xml
@@ -2989,11 +2989,11 @@
-
+ {$mac|replace:'-':''|upper}
-
+ {$mac|replace:'-':''|upper}
diff --git a/resources/templates/provision/grandstream/gxp2124/{$mac}.xml b/resources/templates/provision/grandstream/gxp2124/{$mac}.xml
index 92be242eb8..5a43867826 100644
--- a/resources/templates/provision/grandstream/gxp2124/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2124/{$mac}.xml
@@ -2031,10 +2031,10 @@
86400
-
+ {$mac|replace:'-':''|upper}
-
+ {$mac|replace:'-':''|upper}
0
diff --git a/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml b/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml
index 39f1e54710..3f1d7c357c 100644
--- a/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml
@@ -2820,10 +2820,10 @@
86400
-
+ {$mac|replace:'-':''|upper}
-
+ {$mac|replace:'-':''|upper}
0
diff --git a/resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml b/resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml
index 386b7e37db..82b7ba6212 100644
--- a/resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml
@@ -3479,11 +3479,11 @@
-
+{$mac|replace:'-':''|upper}
-
+{$mac|replace:'-':''|upper}
diff --git a/resources/templates/provision/grandstream/gxp2200/{$mac}.xml b/resources/templates/provision/grandstream/gxp2200/{$mac}.xml
index 937704471b..39c32d3ee0 100644
--- a/resources/templates/provision/grandstream/gxp2200/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2200/{$mac}.xml
@@ -3177,10 +3177,10 @@ Account 5 Codec Settings
86400
-
+{$mac|replace:'-':''|upper}
-
+{$mac|replace:'-':''|upper}
diff --git a/resources/templates/provision/grandstream/gxp3240/{$mac}.xml b/resources/templates/provision/grandstream/gxp3240/{$mac}.xml
index c756a7a617..163a7f2ee3 100644
--- a/resources/templates/provision/grandstream/gxp3240/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp3240/{$mac}.xml
@@ -3387,10 +3387,10 @@ Account 5 Codec Settings
86400
-
+{$mac|replace:'-':''|upper}
-
+{$mac|replace:'-':''|upper}
diff --git a/resources/templates/provision/grandstream/gxv3240/{$mac}.xml b/resources/templates/provision/grandstream/gxv3240/{$mac}.xml
index 2beb674740..2f8767f656 100644
--- a/resources/templates/provision/grandstream/gxv3240/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxv3240/{$mac}.xml
@@ -5084,10 +5084,10 @@
86400
-
+{$mac|replace:'-':''|upper}
-
+{$mac|replace:'-':''|upper}
diff --git a/resources/templates/provision/grandstream/gxv3275/{$mac}.xml b/resources/templates/provision/grandstream/gxv3275/{$mac}.xml
index 065ebdd8e7..f7d156e3b1 100644
--- a/resources/templates/provision/grandstream/gxv3275/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxv3275/{$mac}.xml
@@ -3534,10 +3534,10 @@
86400
-
+{$mac|replace:'-':''|upper}
-
+{$mac|replace:'-':''|upper}
diff --git a/resources/templates/provision/grandstream/gxw40xx/{$mac}.xml b/resources/templates/provision/grandstream/gxw40xx/{$mac}.xml
index 2c1e5f73e6..d3d4303416 100644
--- a/resources/templates/provision/grandstream/gxw40xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxw40xx/{$mac}.xml
@@ -167,11 +167,11 @@
300
-
+ {$mac|replace:'-':''|upper}
-
+ {$mac|replace:'-':''|upper}
diff --git a/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml b/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml
index 96d53b271a..5c3c199ffb 100644
--- a/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml
@@ -290,12 +290,12 @@
-
+{$mac|replace:'-':''|upper}
-
+{$mac|replace:'-':''|upper}
diff --git a/resources/templates/provision/grandstream/ht502/{$mac}.xml b/resources/templates/provision/grandstream/ht502/{$mac}.xml
index 592f396463..693f529ef3 100644
--- a/resources/templates/provision/grandstream/ht502/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht502/{$mac}.xml
@@ -126,10 +126,10 @@
300
-
+ {$mac|replace:'-':''|upper}
-
+ {$mac|replace:'-':''|upper}
7547
diff --git a/resources/templates/provision/grandstream/ht503/{$mac}.xml b/resources/templates/provision/grandstream/ht503/{$mac}.xml
index f0c3422f04..548d7ccb17 100644
--- a/resources/templates/provision/grandstream/ht503/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht503/{$mac}.xml
@@ -273,11 +273,11 @@
-
+{$mac|replace:'-':''|upper}
-
+{$mac|replace:'-':''|upper}
diff --git a/resources/templates/provision/grandstream/ht701/{$mac}.xml b/resources/templates/provision/grandstream/ht701/{$mac}.xml
index 3ad60d9511..25c5dc457a 100644
--- a/resources/templates/provision/grandstream/ht701/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht701/{$mac}.xml
@@ -189,11 +189,11 @@
-
+{$mac|replace:'-':''|upper}
-
+{$mac|replace:'-':''|upper}
diff --git a/resources/templates/provision/grandstream/ht702/{$mac}.xml b/resources/templates/provision/grandstream/ht702/{$mac}.xml
index 6c56934cf5..cfdac39766 100644
--- a/resources/templates/provision/grandstream/ht702/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht702/{$mac}.xml
@@ -196,11 +196,11 @@
-
+{$mac|replace:'-':''|upper}
-
+{$mac|replace:'-':''|upper}
diff --git a/resources/templates/provision/grandstream/ht704/{$mac}.xml b/resources/templates/provision/grandstream/ht704/{$mac}.xml
index 391053da49..e797147350 100644
--- a/resources/templates/provision/grandstream/ht704/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht704/{$mac}.xml
@@ -193,11 +193,11 @@
-
+{$mac|replace:'-':''|upper}
-
+{$mac|replace:'-':''|upper}
diff --git a/resources/templates/provision/grandstream/ht801/{$mac}.xml b/resources/templates/provision/grandstream/ht801/{$mac}.xml
index 4e564845ec..8db50926de 100644
--- a/resources/templates/provision/grandstream/ht801/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht801/{$mac}.xml
@@ -256,11 +256,11 @@
-
+ {$mac|replace:'-':''|upper}
-
+ {$mac|replace:'-':''|upper}
diff --git a/resources/templates/provision/grandstream/ht802/{$mac}.xml b/resources/templates/provision/grandstream/ht802/{$mac}.xml
index 3f57dce778..040cd6d61b 100644
--- a/resources/templates/provision/grandstream/ht802/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht802/{$mac}.xml
@@ -256,11 +256,11 @@
-
+ {$mac|replace:'-':''|upper}
-
+ {$mac|replace:'-':''|upper}