diff --git a/ext-peer.network.j2 b/ext-peer.network.j2
index 3a16ba1..86464ad 100644
--- a/ext-peer.network.j2
+++ b/ext-peer.network.j2
@@ -1,5 +1,6 @@
 [Match]
-Name=dn42{% if ifacename is defined %}{{ item.ifacename }}{% else %}{{ item['remotename'] }}{% endif %}
+Name={% if item.ifacename is defined %}{{ item.ifacename }}{% else %}dn42{{ item['remotename'] }}{% endif %}
+
 
 [Network]
 DHCP=false
@@ -10,6 +11,8 @@ KeepConfiguration=true
 IPv4ReversePathFilter=no
 Description=DN42 peering with AS{{ item.asn }}{% if item.wireguard|default(true) %} @ {% if item.remotehost is defined %}{{ item.remotehost }}[{{ item.remoteip }}]:{{ item.remoteport }}{% else %}[{{ item.remoteip }}]:{{ item.remoteport }}{% endif %} {% endif %}
 
+LinkLocalAddressing=false
+
 [Address]
 {% if item['llv6'] is defined %}
 Address={{ item['llv6'] }}/{% if item.remote_llv6 is defined %}128{% else %}64{% endif %}