diff --git a/roles/network/templates/hostapd/hostapd.conf.j2 b/roles/network/templates/hostapd/hostapd.conf.j2
index fa1ce62cb..1eb39a8c1 100644
--- a/roles/network/templates/hostapd/hostapd.conf.j2
+++ b/roles/network/templates/hostapd/hostapd.conf.j2
@@ -1,6 +1,7 @@
 # Basic configuration
 
-interface={% if iiab_wireless_lan_iface is defined %} {{ iiab_wireless_lan_iface }} {% endif %}
+interface={% if iiab_wireless_lan_iface is defined %}{{ iiab_wireless_lan_iface }}{% endif %}
+
 ssid={{ host_ssid }}
 channel={{ host_channel }}
 {%if iiab_lan_iface  == "br0" %}
diff --git a/roles/network/templates/network/rpi.j2 b/roles/network/templates/network/rpi.j2
index b2e6ab083..b426fa81e 100644
--- a/roles/network/templates/network/rpi.j2
+++ b/roles/network/templates/network/rpi.j2
@@ -5,7 +5,8 @@
 #################   LANCONTROLLER   ###################
 auto br0
 iface br0 inet manual
-    bridge_ports {% if iiab_wireless_lan_iface is defined %} {{ iiab_wireless_lan_iface }} {% endif %} {% if iiab_wired_lan_iface is defined %} {{ iiab_wired_lan_iface }} {% endif %}
+    bridge_ports {% if iiab_wireless_lan_iface is defined %}{{ iiab_wireless_lan_iface }}{% endif %} {% if iiab_wired_lan_iface is defined %} {{ iiab_wired_lan_iface }}{% endif %}
+
     bridge_maxwait 0
     dns-nameservers 127.0.0.1
     dns-search {{ iiab_domain }}
diff --git a/roles/network/templates/network/systemd.j2 b/roles/network/templates/network/systemd.j2
index c84b9735a..9f9e143d6 100644
--- a/roles/network/templates/network/systemd.j2
+++ b/roles/network/templates/network/systemd.j2
@@ -9,9 +9,8 @@ iface br0 inet manual
 {% else %}
 iface br0 inet static
 {% endif %}
-{% if iiab_wired_lan_iface != "none" %}
-    bridge_ports {{ iiab_wired_lan_iface }}
-{% endif %}
+    bridge_ports {% if iiab_wireless_lan_iface is defined %}{{ iiab_wireless_lan_iface }} {% endif %}{% if iiab_wired_lan_iface is defined %}{{ iiab_wired_lan_iface }}{% endif %}
+
     bridge_maxwait 0
 {% if dhcpcd_result != "enabled" %}
     address {{ lan_ip }}