diff --git a/roles/fabric/templates/bridge.intf.j2 b/roles/fabric/templates/bridge.intf.j2
index 0e3d4fe..692cb25 100644
--- a/roles/fabric/templates/bridge.intf.j2
+++ b/roles/fabric/templates/bridge.intf.j2
@@ -1,8 +1,12 @@
 {# Note that there must be exactly one VLAN-aware bridge. #}
-{% set bridge = interfaces | selectattr('type') | selectattr('type.value', '==', 'bridge') | first %}
-{# interfaces that belong to this bridge #}
-{% set ports = interfaces | selectattr('enabled') | selectattr('bridge') | selectattr('bridge.name', '==', bridge.name) %}
-{# allowed VLANs can be specified on the bridge, any of its ports, or all VLANs in NetBox #}
+{% set bridge = interfaces
+        | selectattr('type') | selectattr('type.value', '==', 'bridge')
+        | first %}
+{% set ports = interfaces
+        | selectattr('bridge') | selectattr('bridge.name', '==', bridge.name)
+        | selectattr('enabled') %}
+
+{#- Allowed VLANs can be specified on the bridge, any of its ports, or all VLANs in NetBox. #}
 {% set my_vlans = bridge.tagged_vlans or vlans %}
 {% set my_vlan_ids = my_vlans | map(attribute='vid') | sort -%}
 
diff --git a/roles/fabric/templates/loopback.intf.j2 b/roles/fabric/templates/loopback.intf.j2
index 926b4d0..6e587e7 100644
--- a/roles/fabric/templates/loopback.intf.j2
+++ b/roles/fabric/templates/loopback.intf.j2
@@ -1,9 +1,14 @@
-{% set addrs = interfaces | selectattr('name', '==', 'lo') |
-        map(attribute='ip_addresses') | first | selectattr('role') %}
-{% set loopback = addrs | selectattr('role.value', '==', 'loopback') |
-        map(attribute='address') %}
-{% set anycast = addrs | selectattr('role.value', '==', 'anycast') |
-        map(attribute='address') %}
+{% set addrs = interfaces
+        | selectattr('name', '==', 'lo')
+        | map(attribute='ip_addresses')
+        | first | selectattr('role') %}
+{% set loopback = addrs
+        | selectattr('role.value', '==', 'loopback')
+        | map(attribute='address') %}
+{% set anycast = addrs
+        | selectattr('role.value', '==', 'anycast')
+        | map(attribute='address') -%}
+
 auto lo
 iface lo inet loopback
 {% for address in loopback %}