diff --git a/templates/addressmanager-service.yaml.j2 b/templates/addressmanager-service.yaml.j2
index 2144983..7549c3f 100644
--- a/templates/addressmanager-service.yaml.j2
+++ b/templates/addressmanager-service.yaml.j2
@@ -33,7 +33,7 @@
         name: addresses_vsg
         addresses: {{ addresspool_vsg_cidr }}
         gateway_ip: {{ addresspool_vsg_cidr | ipaddr('1') | ipaddr('address') }}
-        gateway_mac:  {{ ( vtn_net_public_hwaddr_prefix ~ ( vtn_net_public_cidr | ipaddr('1') | ipaddr('address') | ip4_hex )) | hwaddr('linux') }}
+        gateway_mac:  {{ fabric_gateway_hwaddr }}
       requirements:
         - service:
             node: service#addressmanager
@@ -45,7 +45,7 @@
         name: addresses_public
         addresses: {{ addresspool_public_cidr }}
         gateway_ip: {{ addresspool_public_cidr | ipaddr('1') | ipaddr('address') }}
-        gateway_mac:  {{ ( vtn_net_public_hwaddr_prefix ~ ( vtn_net_public_cidr | ipaddr('1') | ipaddr('address') | ip4_hex )) | hwaddr('linux') }}
+        gateway_mac:  {{ fabric_gateway_hwaddr }}
       requirements:
         - service:
             node: service#addressmanager
diff --git a/templates/cord-services.yaml.j2 b/templates/cord-services.yaml.j2
index 6ffab9e..933f968 100644
--- a/templates/cord-services.yaml.j2
+++ b/templates/cord-services.yaml.j2
@@ -134,7 +134,7 @@
         name: addresses_vsg
         addresses: {{ addresspool_vsg_cidr }}
         gateway_ip: {{ addresspool_vsg_cidr | ipaddr('1') | ipaddr('address') }}
-        gateway_mac:  {{ ( vtn_net_public_hwaddr_prefix ~ ( vtn_net_public_cidr | ipaddr('1') | ipaddr('address') | ip4_hex )) | hwaddr('linux') }}
+        gateway_mac:  {{ fabric_gateway_hwaddr }}
       requirements:
         - service:
             node: service#addressmanager
@@ -146,7 +146,7 @@
         name: addresses_public
         addresses: {{ addresspool_public_cidr }}
         gateway_ip: {{ addresspool_public_cidr | ipaddr('1') | ipaddr('address') }}
-        gateway_mac:  {{ ( vtn_net_public_hwaddr_prefix ~ ( vtn_net_public_cidr | ipaddr('1') | ipaddr('address') | ip4_hex )) | hwaddr('linux') }}
+        gateway_mac:  {{ fabric_gateway_hwaddr }}
       requirements:
         - service:
             node: service#addressmanager