diff --git a/roles/bird/templates/bird/bird.conf.j2 b/roles/bird/templates/bird/bird.conf.j2
index 8449e576..295cc21f 100644
--- a/roles/bird/templates/bird/bird.conf.j2
+++ b/roles/bird/templates/bird/bird.conf.j2
@@ -20,7 +20,7 @@ listen bgp address {{ bind }} port 179;
 # with other routers in the network, it performs synchronization of BIRD's
 # routing tables with the OS kernel.
 protocol kernel {
-	persist;
+#	persist;
 	scan time 60;
 	import none;
 	export all;
diff --git a/roles/bird/templates/bird/bird6.conf.j2 b/roles/bird/templates/bird/bird6.conf.j2
index dd5b5590..4d1cea0e 100644
--- a/roles/bird/templates/bird/bird6.conf.j2
+++ b/roles/bird/templates/bird/bird6.conf.j2
@@ -19,7 +19,7 @@ listen bgp address {{ bind }} port 179;
 # with other routers in the network, it performs synchronization of BIRD's
 # routing tables with the OS kernel.
 protocol kernel {
-	persist;
+#	persist;
 	scan time 60;
 	import none;
 	export all;
@@ -39,7 +39,7 @@ protocol static {
 }
 
 {%for bgp in bird.ipv6.bgps %}
-protocol bgp zayo {
+protocol bgp {{ bgp.name }} {
 	local as {{ bgp.local_as }};
 {% if bgp.allow_local_as is defined %}
 	allow local as {{ bgp.allow_local_as }};