diff --git a/templates/bridge_Debian.j2 b/templates/bridge_Debian.j2
index 5a74afd..8f80610 100644
--- a/templates/bridge_Debian.j2
+++ b/templates/bridge_Debian.j2
@@ -18,13 +18,14 @@ bridge_stp {{ item.stp }}
 {% endif %}
 {% endif %}
 
-{% if item.bootproto == 'dhcp' %}
-iface {{ item.device }}  inet dhcp
+{% if item.bootproto == 'dhcp' or item.bootproto == 'manual' %}
+iface {{ item.device }}  inet {{ item.bootproto }}
 {% if item.ports is defined %}        
-bridge_ports {{ item.port }}
+bridge_ports {{ item.ports | join(" ") }}
 {% endif %}
 {% if item.stp is defined %}        
 bridge_stp {{ item.stp }}
+bridge_maxwait 0
 {% endif %}
 {% endif %}