diff --git a/roles/ipv6_edge_router/tasks/main.yml b/roles/ipv6_edge_router/tasks/main.yml
index f7e0a23..26e0c48 100644
--- a/roles/ipv6_edge_router/tasks/main.yml
+++ b/roles/ipv6_edge_router/tasks/main.yml
@@ -6,18 +6,18 @@
 - name: Tweak sysctl for table size
   ansible.posix.sysctl:
     name: net.ipv6.route.max_size
-    value: 500000
+    value: '500000'
     sysctl_set: yes
 
 - name: Setup Quagga configuration
   template:
     src: "{{ item }}.j2"
-    dest: "/etc/quagga/{{ item.dest }}"
+    dest: "/etc/quagga/{{ item }}"
     mode: u=rw,g=r,o=r
   loop:
-    - daemons.j2
-    - zebra.conf.j2
-    - bgpd.conf.j2
+    - daemons
+    - zebra.conf
+    - bgpd.conf
   notify:
     - restart bgpd
     - restart zebra
diff --git a/roles/ipv6_edge_router/templates/bgpd.conf.j2 b/roles/ipv6_edge_router/templates/bgpd.conf.j2
index 3456739..edb593d 100644
--- a/roles/ipv6_edge_router/templates/bgpd.conf.j2
+++ b/roles/ipv6_edge_router/templates/bgpd.conf.j2
@@ -1,5 +1,5 @@
 router bgp 43619
-  #no synchronization
+  no synchronization
   bgp router-id 45.66.111.254
 
   # Remote-AS: Zayo.
@@ -9,5 +9,5 @@ router bgp 43619
     neighbor 2001:1b48:2:103::d7:1 activate
   exit-address-family
 !
-log file /var/log/quagga/bgpd.conf
+log file /var/log/quagga/bgpd.log
 log stdout
diff --git a/roles/ipv6_edge_router/templates/daemons.j2 b/roles/ipv6_edge_router/templates/daemons.j2
index 9cef233..957a337 100644
--- a/roles/ipv6_edge_router/templates/daemons.j2
+++ b/roles/ipv6_edge_router/templates/daemons.j2
@@ -1,22 +1,8 @@
-# This file tells the frr package which daemons to start.
-#
-# Sample configurations for these daemons can be found in
-# /usr/share/doc/frr/examples/.
-#
-# ATTENTION:
-#
-# When activation a daemon at the first time, a config file, even if it is
-# empty, has to be present *and* be owned by the user and group "frr", else
-# the daemon will not be started by /etc/init.d/frr. The permissions should
-# be u=rw,g=r,o=.
-# When using "vtysh" such a config file is also needed. It should be owned by
-# group "frrvty" and set to ug=rw,o= though. Check /etc/pam.d/frr, too.
-#
-# The watchfrr and zebra daemons are always started.
-#
+
 {% if 'backup' in inventory_hostname %}
 bgpd=no
 {% else %}
+zebra=yes
 bgpd=yes
 {% endif %}
 ospfd=no