diff --git a/roles/interfaces/templates/network/interfaces.d/00-srv.j2 b/roles/interfaces/templates/network/interfaces.d/00-srv.j2
index a1426f64..ba4f486c 100644
--- a/roles/interfaces/templates/network/interfaces.d/00-srv.j2
+++ b/roles/interfaces/templates/network/interfaces.d/00-srv.j2
@@ -12,27 +12,23 @@ iface {{ srv_iface.stdout }} inet static
 	dns-nameservers {{ srv_dns }}
 	dns-search crans.org
 	up /sbin/ip link set $IFACE alias srv
-{% if 'interfaces' in ansible_local %}
-{% if 'sup_if_4' in ansible_local.interfaces %}
+{% if ansible_local.interfaces.sup_if_4 is defined %}
 {% if srv_iface.stdout in ansible_local.interfaces.sup_if_4 %}
 {% for line in ansible_local.interfaces.sup_if_4[srv_iface.stdout] %}
 	{{ line }}
 {% endfor %}
 {% endif %}
 {% endif %}
-{% endif %}
 
 iface {{ srv_iface.stdout }} inet6 static
 	address {{ srv.ipv6[0].address }}/{{ srv.ipv6[0].prefix }}
 	autoconf 1
 	accept_ra 2
 	up /sbin/sysctl net/ipv6/conf/$IFACE/accept_ra_defrtr=1
-{% if 'interfaces' in ansible_local %}
-{% if 'sup_if_6' in ansible_local.interfaces %}
+{% if ansible_local.interfaces.sup_if_6 is defined %}
 {% if srv_iface.stdout in ansible_local.interfaces.sup_if_6 %}
 {% for line in ansible_local.interfaces.sup_if_6[srv_iface.stdout] %}
 	{{ line }}
 {% endfor %}
 {% endif %}
 {% endif %}
-{% endif %}
diff --git a/roles/interfaces/templates/network/interfaces.d/01-ens.j2 b/roles/interfaces/templates/network/interfaces.d/01-ens.j2
index 4da6da89..36e6d154 100644
--- a/roles/interfaces/templates/network/interfaces.d/01-ens.j2
+++ b/roles/interfaces/templates/network/interfaces.d/01-ens.j2
@@ -12,27 +12,23 @@ iface {{ ens_iface.stdout }} inet static
 	dns-nameservers {{ ens_dns }}
 	dns-search crans.org
 	up /sbin/ip link set $IFACE alias ens
-{% if 'interfaces' in ansible_local %}
-{% if 'sup_if_4' in ansible_local.interfaces %}
+{% if ansible_local.interfaces.sup_if_4 is defined %}
 {% if ens_iface.stdout in ansible_local.interfaces.sup_if_4 %}
 {% for line in ansible_local.interfaces.sup_if_4[ens_iface.stdout] %}
 	{{ line }}
 {% endfor %}
 {% endif %}
 {% endif %}
-{% endif %}
 
 iface {{ ens_iface.stdout }} inet6 static
 	address {{ ens.ipv6[0].address }}/{{ ens.ipv6[0].prefix }}
 	autoconf 1
 	accept_ra 2
 	up /sbin/sysctl net/ipv6/conf/$IFACE/accept_ra_defrtr=1
-{% if 'interfaces' in ansible_local %}
-{% if 'sup_if_6' in ansible_local.interfaces %}
+{% if ansible_local.interfaces.sup_if_6 is defined %}
 {% if ens_iface.stdout in ansible_local.interfaces.sup_if_6 %}
 {% for line in ansible_local.interfaces.sup_if_6[ens_iface.stdout] %}
 	{{ line }}
 {% endfor %}
 {% endif %}
 {% endif %}
-{% endif %}
diff --git a/roles/interfaces/templates/network/interfaces.d/02-adm.j2 b/roles/interfaces/templates/network/interfaces.d/02-adm.j2
index 1708e777..a78a660a 100644
--- a/roles/interfaces/templates/network/interfaces.d/02-adm.j2
+++ b/roles/interfaces/templates/network/interfaces.d/02-adm.j2
@@ -11,24 +11,20 @@ iface {{ adm_iface.stdout }} inet static
 	dns-nameservers {{ adm_dns }}
 	dns-search adm.crans.org
 	up /sbin/ip link set $IFACE alias adm
-{% if 'interfaces' in ansible_local %}
-{% if 'sup_if_4' in ansible_local.interfaces %}
+{% if ansible_local.interfaces.sup_if_4 is defined %}
 {% if adm_iface.stdout in ansible_local.interfaces.sup_if_4 %}
 {% for line in ansible_local.interfaces.sup_if_4[adm_iface.stdout] %}
 	{{ line }}
 {% endfor %}
 {% endif %}
 {% endif %}
-{% endif %}
 
 iface {{ adm_iface.stdout }} inet6 static
 	address {{ adm.ipv6[0].address }}/{{ adm.ipv6[0].prefix }}
-{% if 'interfaces' in ansible_local %}
-{% if 'sup_if_6' in ansible_local.interfaces %}
+{% if ansible_local.interfaces.sup_if_6 is defined %}
 {% if adm_iface.stdout in ansible_local.interfaces.sup_if_6 %}
 {% for line in ansible_local.interfaces.sup_if_6[adm_iface.stdout] %}
 	{{ line }}
 {% endfor %}
 {% endif %}
 {% endif %}
-{% endif %}
diff --git a/roles/interfaces/templates/network/interfaces.d/03-borne.j2 b/roles/interfaces/templates/network/interfaces.d/03-borne.j2
index 749f144e..f9996740 100644
--- a/roles/interfaces/templates/network/interfaces.d/03-borne.j2
+++ b/roles/interfaces/templates/network/interfaces.d/03-borne.j2
@@ -11,24 +11,20 @@ iface {{ borne_iface.stdout }} inet static
 	dns-nameservers {{ borne_dns }}
 	dns-search borne.crans.org
 	up /sbin/ip link set $IFACE alias borne
-{% if 'interfaces' in ansible_local %}
-{% if 'sup_if_4' in ansible_local.interfaces %}
+{% if ansible_local.interfaces.sup_if_4 is defined %}
 {% if borne_iface.stdout in ansible_local.interfaces.sup_if_4 %}
 {% for line in ansible_local.interfaces.sup_if_4[borne_iface.stdout] %}
 	{{ line }}
 {% endfor %}
 {% endif %}
 {% endif %}
-{% endif %}
 
 iface {{ borne_iface.stdout }} inet6 static
 	address {{ borne.ipv6[0].address }}/{{ borne.ipv6[0].prefix }}
-{% if 'interfaces' in ansible_local %}
-{% if 'sup_if_6' in ansible_local.interfaces %}
+{% if ansible_local.interfaces.sup_if_6 is defined %}
 {% if borne_iface.stdout in ansible_local.interfaces.sup_if_6 %}
 {% for line in ansible_local.interfaces.sup_if_6[borne_iface.stdout] %}
 	{{ line }}
 {% endfor %}
 {% endif %}
 {% endif %}
-{% endif %}
diff --git a/roles/interfaces/templates/network/interfaces.d/04-switch.j2 b/roles/interfaces/templates/network/interfaces.d/04-switch.j2
index fb007a7b..57e6630f 100644
--- a/roles/interfaces/templates/network/interfaces.d/04-switch.j2
+++ b/roles/interfaces/templates/network/interfaces.d/04-switch.j2
@@ -11,24 +11,20 @@ iface {{ switch_iface.stdout }} inet static
 	dns-nameservers {{ switch_dns }}
 	dns-search switch.crans.org
 	up /sbin/ip link set $IFACE alias switch
-{% if 'interfaces' in ansible_local %}
-{% if 'sup_if_4' in ansible_local.interfaces %}
+{% if ansible_local.interfaces.sup_if_4 is defined %}
 {% if switch_iface.stdout in ansible_local.interfaces.sup_if_4 %}
 {% for line in ansible_local.interfaces.sup_if_4[switch_iface.stdout] %}
 	{{ line }}
 {% endfor %}
 {% endif %}
 {% endif %}
-{% endif %}
 
 iface {{ switch_iface.stdout }} inet6 static
 	address {{ switch.ipv6[0].address }}/{{ switch.ipv6[0].prefix }}
-{% if 'interfaces' in ansible_local %}
-{% if 'sup_if_6' in ansible_local.interfaces %}
+{% if ansible_local.interfaces.sup_if_6 is defined %}
 {% if switch_iface.stdout in ansible_local.interfaces.sup_if_6 %}
 {% for line in ansible_local.interfaces.sup_if_6[switch_iface.stdout] %}
 	{{ line }}
 {% endfor %}
 {% endif %}
 {% endif %}
-{% endif %}
diff --git a/roles/interfaces/templates/network/interfaces.d/21-fil.j2 b/roles/interfaces/templates/network/interfaces.d/21-fil.j2
index a77e747f..198f2ca0 100644
--- a/roles/interfaces/templates/network/interfaces.d/21-fil.j2
+++ b/roles/interfaces/templates/network/interfaces.d/21-fil.j2
@@ -12,24 +12,20 @@ iface {{ fil_iface.stdout }} inet static
 	dns-nameservers {{ fil_dns }}
 	dns-search fil.crans.org
 	up /sbin/ip link set $IFACE alias fil
-{% if 'interfaces' in ansible_local %}
-{% if 'sup_if_4' in ansible_local.interfaces %}
+{% if ansible_local.interfaces.sup_if_4 is defined %}
 {% if fil_iface.stdout in ansible_local.interfaces.sup_if_4 %}
 {% for line in ansible_local.interfaces.sup_if_4[fil_iface.stdout] %}
 	{{ line }}
 {% endfor %}
 {% endif %}
 {% endif %}
-{% endif %}
 
 iface {{ fil_iface.stdout }} inet6 static
 	address {{ fil.ipv6[0].address }}/{{ fil.ipv6[0].prefix }}
-{% if 'interfaces' in ansible_local %}
-{% if 'sup_if_6' in ansible_local.interfaces %}
+{% if ansible_local.interfaces.sup_if_6 is defined %}
 {% if fil_iface.stdout in ansible_local.interfaces.sup_if_6 %}
 {% for line in ansible_local.interfaces.sup_if_6[fil_iface.stdout] %}
 	{{ line }}
 {% endfor %}
 {% endif %}
 {% endif %}
-{% endif %}
diff --git a/roles/interfaces/templates/network/interfaces.d/23-adh.j2 b/roles/interfaces/templates/network/interfaces.d/23-adh.j2
index ee1578d6..df9a47ad 100644
--- a/roles/interfaces/templates/network/interfaces.d/23-adh.j2
+++ b/roles/interfaces/templates/network/interfaces.d/23-adh.j2
@@ -12,27 +12,23 @@ iface {{ adh_iface.stdout }} inet static
 	dns-nameservers {{ adh_dns }}
 	dns-search crans.org
 	up /sbin/ip link set $IFACE alias adh
-{% if 'interfaces' in ansible_local %}
-{% if 'sup_if_4' in ansible_local.interfaces %}
+{% if ansible_local.interfaces.sup_if_4 is defined %}
 {% if adh_iface.stdout in ansible_local.interfaces.sup_if_4 %}
 {% for line in ansible_local.interfaces.sup_if_4[adh_iface.stdout] %}
 	{{ line }}
 {% endfor %}
 {% endif %}
 {% endif %}
-{% endif %}
 
 iface {{ adh_iface.stdout }} inet6 static
 	address {{ adh.ipv6[0].address }}/{{ adh.ipv6[0].prefix }}
 	autoconf 1
 	accept_ra 2
 	up /sbin/sysctl net/ipv6/conf/$IFACE/accept_ra_defrtr=1
-{% if 'interfaces' in ansible_local %}
-{% if 'sup_if_6' in ansible_local.interfaces %}
+{% if ansible_local.interfaces.sup_if_6 is defined %}
 {% if adh_iface.stdout in ansible_local.interfaces.sup_if_6 %}
 {% for line in ansible_local.interfaces.sup_if_6[adh_iface.stdout] %}
 	{{ line }}
 {% endfor %}
 {% endif %}
 {% endif %}
-{% endif %}