diff --git a/network/domains-batman-systemd.sls b/network/domains-batman-systemd.sls
index 4946fe528d4baecd0aa6e2c48a42d7da93a38400..e92b7ed2eb2b577cb3a3a6408da455ce18aa98d0 100644
--- a/network/domains-batman-systemd.sls
+++ b/network/domains-batman-systemd.sls
@@ -105,6 +105,7 @@ dom.service:
     - context:
         domain: {{ domain }}
         domain_id: {{ domain_id }}
+        vtep: {{ pillar['vtep'] }}
 
 
 /etc/systemd/network/50-{{ domain }}-peers-br.netdev:
diff --git a/network/files/systemd/vxlan_batadv.netdev.j2 b/network/files/systemd/vxlan_batadv.netdev.j2
index d26855ef370e3965db611a3901f7af51cf31d387..eb4caba8dc655b39d5210de00b8b7cf514d96662 100644
--- a/network/files/systemd/vxlan_batadv.netdev.j2
+++ b/network/files/systemd/vxlan_batadv.netdev.j2
@@ -2,7 +2,7 @@
 Kind=vxlan
 Name={{ domain }}-tp
 MTUBytes={{ salt['pillar.get']('domains:%s:mtu' | format(domain), 1312) }}
-MACAddress={{ salt['net.vxlan_mac'](domain_id, host_id) }}
+MACAddress={{ salt['net.vxlan_mac'](domain_id, salt['pillar.get']('host:id:primary')) }}
 
 [VXLAN]
 DestinationPort=4789