diff --git a/lib/NGCP/Panel/Utils/DeviceBootstrap/Panasonic.pm b/lib/NGCP/Panel/Utils/DeviceBootstrap/Panasonic.pm
index 14dd58178a..a7d3dd5b00 100644
--- a/lib/NGCP/Panel/Utils/DeviceBootstrap/Panasonic.pm
+++ b/lib/NGCP/Panel/Utils/DeviceBootstrap/Panasonic.pm
@@ -55,7 +55,7 @@ EOS_XML
 around 'process_bootstrap_uri' => sub {
     my($orig_method, $self, $uri) = @_;
     $uri = $self->$orig_method($uri);
-    $uri = $self->bootstrap_uri_mac($uri);
+    $uri = $self->bootstrap_uri_mac($uri, "{MAC}");
     $self->content_params->{uri} = $uri;
     return $self->content_params->{uri};
 };
diff --git a/lib/NGCP/Panel/Utils/DeviceBootstrap/Snom.pm b/lib/NGCP/Panel/Utils/DeviceBootstrap/Snom.pm
index b0ed4a48a3..82f99ce953 100644
--- a/lib/NGCP/Panel/Utils/DeviceBootstrap/Snom.pm
+++ b/lib/NGCP/Panel/Utils/DeviceBootstrap/Snom.pm
@@ -293,4 +293,12 @@ sub generate_normalized_string {
     return $normalized;
 }
 
+around 'process_bootstrap_uri' => sub {
+    my($orig_method, $self, $uri) = @_;
+    $uri = $self->$orig_method($uri);
+    $uri = $self->bootstrap_uri_mac($uri, "{mac}");
+    $self->content_params->{uri} = $uri;
+    return $self->content_params->{uri};
+};
+
 1;
diff --git a/lib/NGCP/Panel/Utils/DeviceBootstrap/VendorRPC.pm b/lib/NGCP/Panel/Utils/DeviceBootstrap/VendorRPC.pm
index 314ec0266d..4f111c12d0 100644
--- a/lib/NGCP/Panel/Utils/DeviceBootstrap/VendorRPC.pm
+++ b/lib/NGCP/Panel/Utils/DeviceBootstrap/VendorRPC.pm
@@ -215,12 +215,12 @@ sub bootstrap_uri_protocol{
     return $uri;
 }
 sub bootstrap_uri_mac{
-    my($self, $uri) = @_;
-    if ($uri !~/\{MAC\}$/){
-        if ($uri !~/\/$/){
-            $uri .= '/' ;
+    my($self, $uri, $label) = @_;
+    if ($uri !~ /\Q$label\E$/) {
+        if ($uri !~ /\/$/) {
+            $uri .= '/';
         }
-        $uri .= '{MAC}' ;
+        $uri .= $label;
     }
     return $uri;
 }