diff --git a/templates/networking.j2 b/templates/networking.j2
index 20375fc..f2dd825 100644
--- a/templates/networking.j2
+++ b/templates/networking.j2
@@ -10,8 +10,8 @@ auto eth0
 {% if bridged_network is defined and bridged_network %}
 auto br0
 iface br0
-    requires eth0
-    bridge-ports eth0
+    requires eth0{% if bridged_network != "true" %} {{ bridged_network }}{% endif +%}
+    bridge-ports eth0{% if bridged_network != "true" %} {{ bridged_network }}{% endif +%}
     bridge-fd 0
     bridge-stp off
 {% else %}
@@ -27,7 +27,11 @@ iface eth0
 {% if local_network.gateway6 is defined %}
     address {{ wanted_ip6 }}/64
     gateway {{ local_network.gateway6 }}
+    {% if bridged_network is defined and bridged_network %}
+    up echo 0 > /proc/sys/net/ipv6/conf/br0/accept_ra
+    {% else %}
     pre-up echo 0 > /proc/sys/net/ipv6/conf/eth0/accept_ra
+    {% endif %}
 {% else %}
     address {{ wanted_ip6 }}/128
     post-up ip addrlabel add prefix {{ wanted_ip6 }}/64 label 99