diff --git a/roles/quagga/templates/quagga/bgpd.conf.j2 b/roles/quagga/templates/quagga/bgpd.conf.j2
index cde7878b..2f5117a0 100644
--- a/roles/quagga/templates/quagga/bgpd.conf.j2
+++ b/roles/quagga/templates/quagga/bgpd.conf.j2
@@ -5,12 +5,12 @@ router bgp {{ bgp.as }}
  bgp router-id {{ bgp.router_id_v4 }}
  network {{ bgp.network_v4 }}
  neighbor {{ bgp.neighbor_v4 }} remote-as {{ bgp.remote_as }}
-!
-router bgp {{ bgp.as }}
- no synchronization
- bgp router-id {{ bgp.router_id_v6 }}
- network {{ bgp.network_v6 }}
  neighbor {{ bgp.neighbor_v6 }} remote-as {{ bgp.remote_as }}
+!
+ address-family ipv6
+ network {{ bgp.network_v6 }}
+ neighbor {{ bgp.neighbor_v6 }} activate
+ exit-address-family
 !
 log file /var/log/quagga/bgpd.log
 log stdout
diff --git a/roles/quagga/templates/quagga/zebra.conf.j2 b/roles/quagga/templates/quagga/zebra.conf.j2
index 1f3a31ca..c97c4bb5 100644
--- a/roles/quagga/templates/quagga/zebra.conf.j2
+++ b/roles/quagga/templates/quagga/zebra.conf.j2
@@ -8,7 +8,4 @@ log file /var/log/quagga/zebra.log
 
 interface lo
 
-!Table Zayo
-table 26
-
 line vty