frr: T4353: fix Jinja2 linting errors

22 files changed, 1258 insertions, 1268 deletions

diff --git a/data/templates/frr/bfdd.frr.j2 b/data/templates/frr/bfdd.frr.j2
new file mode 100644
index 000000000..c4adeb402
--- /dev/null
+++ b/data/templates/frr/bfdd.frr.j2
@@ -0,0 +1,58 @@
+{% if profile is vyos_defined or peer is vyos_defined %}
+bfd
+{%     if profile is vyos_defined %}
+{%         for profile_name, profile_config in profile.items() %}
+ profile {{ profile_name }}
+  detect-multiplier {{ profile_config.interval.multiplier }}
+  receive-interval {{ profile_config.interval.receive }}
+  transmit-interval {{ profile_config.interval.transmit }}
+{%             if profile_config.interval.echo_interval is vyos_defined %}
+  echo transmit-interval {{ profile_config.interval.echo_interval }}
+  echo receive-interval {{ profile_config.interval.echo_interval }}
+{%             endif %}
+{%             if profile_config.echo_mode is vyos_defined %}
+  echo-mode
+{%             endif %}
+{%             if profile_config.passive is vyos_defined %}
+  passive-mode
+{%             endif %}
+{%             if profile_config.shutdown is vyos_defined %}
+  shutdown
+{%             else %}
+  no shutdown
+{%             endif %}
+ exit
+ !
+{%         endfor %}
+{%     endif %}
+{%     if peer is vyos_defined %}
+{%         for peer_name, peer_config in peer.items() %}
+ peer {{ peer_name }} {{ 'multihop' if peer_config.multihop is vyos_defined }} {{ 'local-address ' ~ peer_config.source.address if peer_config.source.address is vyos_defined }} {{ 'interface ' ~ peer_config.source.interface if peer_config.source.interface is vyos_defined }} {{ 'vrf ' ~ peer_config.vrf if peer_config.vrf is vyos_defined }}
+  detect-multiplier {{ peer_config.interval.multiplier }}
+  receive-interval {{ peer_config.interval.receive }}
+  transmit-interval {{ peer_config.interval.transmit }}
+{%             if peer_config.interval.echo_interval is vyos_defined %}
+  echo transmit-interval {{ peer_config.interval.echo_interval }}
+  echo receive-interval {{ peer_config.interval.echo_interval }}
+{%             endif %}
+{%             if peer_config.echo_mode is vyos_defined %}
+  echo-mode
+{%             endif %}
+{%             if peer_config.passive is vyos_defined %}
+  passive-mode
+{%             endif %}
+{%             if peer_config.profile is vyos_defined %}
+  profile {{ peer_config.profile }}
+{%             endif %}
+{%             if peer_config.shutdown is vyos_defined %}
+  shutdown
+{%             else %}
+  no shutdown
+{%             endif %}
+ exit
+ !
+{%         endfor %}
+{%     endif %}
+exit
+!
+{% endif %}
diff --git a/data/templates/frr/bfdd.frr.tmpl b/data/templates/frr/bfdd.frr.tmpl
deleted file mode 100644
index ac55d4634..000000000
--- a/data/templates/frr/bfdd.frr.tmpl
+++ /dev/null
@@ -1,58 +0,0 @@
-{% if profile is vyos_defined or peer is vyos_defined %}
-bfd
-{% if profile is vyos_defined %}
-{%   for profile_name, profile_config in profile.items() %}
- profile {{ profile_name }}
-  detect-multiplier {{ profile_config.interval.multiplier }}
-  receive-interval {{ profile_config.interval.receive }}
-  transmit-interval {{ profile_config.interval.transmit }}
-{%     if profile_config.interval.echo_interval is vyos_defined %}
-  echo transmit-interval {{ profile_config.interval.echo_interval }}
-  echo receive-interval {{ profile_config.interval.echo_interval }}
-{%     endif %}
-{%     if profile_config.echo_mode is vyos_defined %}
-  echo-mode
-{%     endif %}
-{%     if profile_config.passive is vyos_defined %}
-  passive-mode
-{%     endif %}
-{%     if profile_config.shutdown is vyos_defined %}
-  shutdown
-{%     else %}
-  no shutdown
-{%     endif %}
- exit
- !
-{%   endfor %}
-{% endif %}
-{% if peer is vyos_defined %}
-{%   for peer_name, peer_config in peer.items() %}
- peer {{ peer_name }}{{ ' multihop' if peer_config.multihop is vyos_defined }}{{ ' local-address ' + peer_config.source.address if peer_config.source.address is vyos_defined }}{{ ' interface ' + peer_config.source.interface if peer_config.source.interface is vyos_defined }} {{ ' vrf ' + peer_config.vrf if peer_config.vrf is vyos_defined }}
-  detect-multiplier {{ peer_config.interval.multiplier }}
-  receive-interval {{ peer_config.interval.receive }}
-  transmit-interval {{ peer_config.interval.transmit }}
-{%     if peer_config.interval.echo_interval is vyos_defined %}
-  echo transmit-interval {{ peer_config.interval.echo_interval }}
-  echo receive-interval {{ peer_config.interval.echo_interval }}
-{%     endif %}
-{%     if peer_config.echo_mode is vyos_defined %}
-  echo-mode
-{%     endif %}
-{%     if peer_config.passive is vyos_defined %}
-  passive-mode
-{%     endif %}
-{%     if peer_config.profile is vyos_defined %}
-  profile {{ peer_config.profile }}
-{%     endif %}
-{%     if peer_config.shutdown is vyos_defined %}
-  shutdown
-{%     else %}
-  no shutdown
-{%     endif %}
- exit
- !
-{%   endfor %}
-{% endif %}
-exit
-!
-{% endif %}
diff --git a/data/templates/frr/bgpd.frr.tmpl b/data/templates/frr/bgpd.frr.j2
index 8baa128a7..7029f39af 100644
--- a/data/templates/frr/bgpd.frr.tmpl
+++ b/data/templates/frr/bgpd.frr.j2
@@ -1,21 +1,21 @@
 {### MACRO definition for recurring peer patter, this can be either fed by a ###}
 {### peer-group or an individual BGP neighbor ###}
 {% macro bgp_neighbor(neighbor, config, peer_group=false) %}
-{%   if peer_group == true %}
+{% if peer_group == true %}
  neighbor {{ neighbor }} peer-group
-{%   elif config.peer_group is vyos_defined %}
+{% elif config.peer_group is vyos_defined %}
  neighbor {{ neighbor }} peer-group {{ config.peer_group }}
-{%   endif %}
-{%   if config.remote_as is vyos_defined %}
+{% endif %}
+{% if config.remote_as is vyos_defined %}
  neighbor {{ neighbor }} remote-as {{ config.remote_as }}
-{%   endif %}
-{%   if config.interface.remote_as is vyos_defined %}
+{% endif %}
+{% if config.interface.remote_as is vyos_defined %}
  neighbor {{ neighbor }} interface remote-as {{ config.interface.remote_as }}
-{%   endif %}
-{%   if config.advertisement_interval is vyos_defined %}
+{% endif %}
+{% if config.advertisement_interval is vyos_defined %}
  neighbor {{ neighbor }} advertisement-interval {{ config.advertisement_interval }}
-{%   endif %}
-{%   if config.bfd is vyos_defined %}
+{% endif %}
+{% if config.bfd is vyos_defined %}
  neighbor {{ neighbor }} bfd
 {%     if config.bfd.check_control_plane_failure is vyos_defined %}
  neighbor {{ neighbor }} bfd check-control-plane-failure
@@ -23,76 +23,74 @@
 {%     if config.bfd.profile is vyos_defined %}
  neighbor {{ neighbor }} bfd profile {{ config.bfd.profile }}
 {%     endif %}
-{%   endif %}
-{%   if config.capability is vyos_defined %}
+{% endif %}
+{% if config.capability is vyos_defined %}
 {%     if config.capability.dynamic is vyos_defined %}
  neighbor {{ neighbor }} capability dynamic
 {%     endif %}
 {%     if config.capability.extended_nexthop is vyos_defined %}
  neighbor {{ neighbor }} capability extended-nexthop
 {%     endif %}
-{%   endif %}
-{%   if config.description is vyos_defined %}
+{% endif %}
+{% if config.description is vyos_defined %}
  neighbor {{ neighbor }} description {{ config.description }}
-{%   endif %}
-{%   if config.disable_capability_negotiation is vyos_defined %}
+{% endif %}
+{% if config.disable_capability_negotiation is vyos_defined %}
  neighbor {{ neighbor }} dont-capability-negotiate
-{%   endif %}
-{%   if config.ebgp_multihop is vyos_defined %}
+{% endif %}
+{% if config.ebgp_multihop is vyos_defined %}
  neighbor {{ neighbor }} ebgp-multihop {{ config.ebgp_multihop }}
-{%   endif %}
-{%   if config.graceful_restart is vyos_defined %}
+{% endif %}
+{% if config.graceful_restart is vyos_defined %}
 {%     if config.graceful_restart is vyos_defined('enable') %}
-{%       set graceful_restart = 'graceful-restart' %}
+{%         set graceful_restart = 'graceful-restart' %}
 {%     elif config.graceful_restart is vyos_defined('disable') %}
-{%       set graceful_restart = 'graceful-restart-disable' %}
+{%         set graceful_restart = 'graceful-restart-disable' %}
 {%     elif config.graceful_restart is vyos_defined('restart-helper') %}
-{%       set graceful_restart = 'graceful-restart-helper' %}
+{%         set graceful_restart = 'graceful-restart-helper' %}
 {%     endif %}
  neighbor {{ neighbor }} {{ graceful_restart }}
-{%   endif %}
-{%   if config.local_as is vyos_defined %}
+{% endif %}
+{% if config.local_as is vyos_defined %}
 {%     for local_as, local_as_config in config.local_as.items() %}
 {#       There can be only one local-as value, this is checked in the Python code #}
  neighbor {{ neighbor }} local-as {{ local_as }} {{ 'no-prepend' if local_as_config.no_prepend is vyos_defined }} {{ 'replace-as' if local_as_config.no_prepend is vyos_defined and local_as_config.no_prepend.replace_as is vyos_defined }}
 {%     endfor %}
-{%   endif %}
-{%   if config.override_capability is vyos_defined %}
+{% endif %}
+{% if config.override_capability is vyos_defined %}
  neighbor {{ neighbor }} override-capability
-{%   endif %}
-{%   if config.passive is vyos_defined %}
+{% endif %}
+{% if config.passive is vyos_defined %}
  neighbor {{ neighbor }} passive
-{%   endif %}
-{%   if config.password is vyos_defined %}
+{% endif %}
+{% if config.password is vyos_defined %}
  neighbor {{ neighbor }} password {{ config.password }}
-{%   endif %}
-{%   if config.port is vyos_defined %}
+{% endif %}
+{% if config.port is vyos_defined %}
  neighbor {{ neighbor }} port {{ config.port }}
-{%   endif %}
-{%   if config.shutdown is vyos_defined %}
+{% endif %}
+{% if config.shutdown is vyos_defined %}
  neighbor {{ neighbor }} shutdown
-{%   endif %}
-{%   if config.solo is vyos_defined %}
+{% endif %}
+{% if config.solo is vyos_defined %}
  neighbor {{ neighbor }} solo
-{%   endif %}
-{%   if config.strict_capability_match is vyos_defined %}
+{% endif %}
+{% if config.strict_capability_match is vyos_defined %}
  neighbor {{ neighbor }} strict-capability-match
-{%   endif %}
-{%   if config.ttl_security.hops is vyos_defined %}
+{% endif %}
+{% if config.ttl_security.hops is vyos_defined %}
  neighbor {{ neighbor }} ttl-security hops {{ config.ttl_security.hops }}
-{%   endif %}
-{%   if config.timers is vyos_defined %}
-{%     if config.timers.connect is vyos_defined %}
+{% endif %}
+{% if config.timers.connect is vyos_defined %}
  neighbor {{ neighbor }} timers connect {{ config.timers.connect }}
-{%     endif %}
-{%     if config.timers.keepalive is vyos_defined and config.timers.holdtime is vyos_defined %}
+{% endif %}
+{% if config.timers.keepalive is vyos_defined and config.timers.holdtime is vyos_defined %}
  neighbor {{ neighbor }} timers {{ config.timers.keepalive }} {{ config.timers.holdtime }}
-{%     endif %}
-{%   endif %}
-{%   if config.update_source is vyos_defined %}
+{% endif %}
+{% if config.update_source is vyos_defined %}
  neighbor {{ neighbor }} update-source {{ config.update_source }}
-{%   endif %}
-{%   if config.interface is vyos_defined %}
+{% endif %}
+{% if config.interface is vyos_defined %}
 {%     if config.interface.peer_group is vyos_defined %}
  neighbor {{ neighbor }} interface peer-group {{ config.interface.peer_group }}
 {%     endif %}
@@ -100,137 +98,137 @@
  neighbor {{ neighbor }} interface {{ config.interface.source_interface }}
 {%     endif %}
 {%     if config.interface.v6only is vyos_defined %}
-{%       if config.interface.v6only.peer_group is vyos_defined %}
+{%         if config.interface.v6only.peer_group is vyos_defined %}
  neighbor {{ neighbor }} interface v6only peer-group {{ config.interface.v6only.peer_group }}
-{%       endif %}
-{%       if config.interface.v6only.remote_as is vyos_defined %}
+{%         endif %}
+{%         if config.interface.v6only.remote_as is vyos_defined %}
  neighbor {{ neighbor }} interface v6only remote-as {{ config.interface.v6only.remote_as }}
-{%       endif %}
+{%         endif %}
 {%     endif %}
-{%   endif %}
+{% endif %}
  !
-{%   if config.address_family is vyos_defined %}
+{% if config.address_family is vyos_defined %}
 {%     for afi, afi_config in config.address_family.items() %}
-{%       if afi == 'ipv4_unicast' %}
+{%         if afi == 'ipv4_unicast' %}
  address-family ipv4 unicast
-{%       elif afi == 'ipv4_multicast' %}
+{%         elif afi == 'ipv4_multicast' %}
  address-family ipv4 multicast
-{%       elif afi == 'ipv4_labeled_unicast' %}
+{%         elif afi == 'ipv4_labeled_unicast' %}
  address-family ipv4 labeled-unicast
-{%       elif afi == 'ipv4_vpn' %}
+{%         elif afi == 'ipv4_vpn' %}
  address-family ipv4 vpn
-{%       elif afi == 'ipv4_flowspec' %}
+{%         elif afi == 'ipv4_flowspec' %}
  address-family ipv4 flowspec
-{%       elif afi == 'ipv6_unicast' %}
+{%         elif afi == 'ipv6_unicast' %}
  address-family ipv6 unicast
-{%       elif afi == 'ipv6_multicast' %}
+{%         elif afi == 'ipv6_multicast' %}
  address-family ipv6 multicast
-{%       elif afi == 'ipv6_labeled_unicast' %}
+{%         elif afi == 'ipv6_labeled_unicast' %}
  address-family ipv6 labeled-unicast
-{%       elif afi == 'ipv6_vpn' %}
+{%         elif afi == 'ipv6_vpn' %}
  address-family ipv6 vpn
-{%       elif afi == 'ipv6_flowspec' %}
+{%         elif afi == 'ipv6_flowspec' %}
  address-family ipv6 flowspec
-{%       elif afi == 'l2vpn_evpn' %}
+{%         elif afi == 'l2vpn_evpn' %}
  address-family l2vpn evpn
-{%       endif %}
-{%       if afi_config.addpath_tx_all is vyos_defined %}
+{%         endif %}
+{%         if afi_config.addpath_tx_all is vyos_defined %}
   neighbor {{ neighbor }} addpath-tx-all-paths
-{%       endif %}
-{%       if afi_config.addpath_tx_per_as is vyos_defined %}
+{%         endif %}
+{%         if afi_config.addpath_tx_per_as is vyos_defined %}
   neighbor {{ neighbor }} addpath-tx-bestpath-per-AS
-{%       endif %}
-{%       if afi_config.allowas_in is vyos_defined %}
+{%         endif %}
+{%         if afi_config.allowas_in is vyos_defined %}
   neighbor {{ neighbor }} allowas-in {{ afi_config.allowas_in.number if afi_config.allowas_in.number is vyos_defined }}
-{%       endif %}
-{%       if afi_config.as_override is vyos_defined %}
+{%         endif %}
+{%         if afi_config.as_override is vyos_defined %}
   neighbor {{ neighbor }} as-override
-{%       endif %}
-{%       if afi_config.conditionally_advertise is vyos_defined %}
-{%         if afi_config.conditionally_advertise.advertise_map is vyos_defined %}
-{%           set exist_non_exist_map = 'exist-map' %}
-{%           if afi_config.conditionally_advertise.exist_map is vyos_defined %}
-{%             set exist_non_exist_map = 'exist-map ' ~ afi_config.conditionally_advertise.exist_map %}
-{%           elif afi_config.conditionally_advertise.non_exist_map is vyos_defined %}
-{%             set exist_non_exist_map = 'non-exist-map ' ~ afi_config.conditionally_advertise.non_exist_map %}
-{%           endif %}
+{%         endif %}
+{%         if afi_config.conditionally_advertise is vyos_defined %}
+{%             if afi_config.conditionally_advertise.advertise_map is vyos_defined %}
+{%                 set exist_non_exist_map = 'exist-map' %}
+{%                 if afi_config.conditionally_advertise.exist_map is vyos_defined %}
+{%                     set exist_non_exist_map = 'exist-map ' ~ afi_config.conditionally_advertise.exist_map %}
+{%                 elif afi_config.conditionally_advertise.non_exist_map is vyos_defined %}
+{%                     set exist_non_exist_map = 'non-exist-map ' ~ afi_config.conditionally_advertise.non_exist_map %}
+{%                 endif %}
   neighbor {{ neighbor }} advertise-map {{ afi_config.conditionally_advertise.advertise_map }} {{ exist_non_exist_map }}
+{%             endif %}
 {%         endif %}
-{%       endif %}
-{%       if afi_config.remove_private_as is vyos_defined %}
+{%         if afi_config.remove_private_as is vyos_defined %}
   neighbor {{ neighbor }} remove-private-AS
-{%       endif %}
-{%       if afi_config.route_reflector_client is vyos_defined %}
+{%         endif %}
+{%         if afi_config.route_reflector_client is vyos_defined %}
   neighbor {{ neighbor }} route-reflector-client
-{%       endif %}
-{%       if afi_config.weight is vyos_defined %}
+{%         endif %}
+{%         if afi_config.weight is vyos_defined %}
   neighbor {{ neighbor }} weight {{ afi_config.weight }}
-{%       endif %}
-{%       if afi_config.attribute_unchanged is vyos_defined %}
+{%         endif %}
+{%         if afi_config.attribute_unchanged is vyos_defined %}
   neighbor {{ neighbor }} attribute-unchanged {{ 'as-path ' if afi_config.attribute_unchanged.as_path is vyos_defined }}{{ 'med ' if afi_config.attribute_unchanged.med is vyos_defined }}{{ 'next-hop ' if afi_config.attribute_unchanged.next_hop is vyos_defined }}
-{%       endif %}
-{%       if afi_config.capability.orf.prefix_list.send is vyos_defined %}
+{%         endif %}
+{%         if afi_config.capability.orf.prefix_list.send is vyos_defined %}
   neighbor {{ neighbor }} capability orf prefix-list send
-{%       endif %}
-{%       if afi_config.capability.orf.prefix_list.receive is vyos_defined %}
+{%         endif %}
+{%         if afi_config.capability.orf.prefix_list.receive is vyos_defined %}
   neighbor {{ neighbor }} capability orf prefix-list receive
-{%       endif %}
-{%       if afi_config.default_originate is vyos_defined %}
+{%         endif %}
+{%         if afi_config.default_originate is vyos_defined %}
   neighbor {{ neighbor }} default-originate {{ 'route-map ' ~ afi_config.default_originate.route_map if afi_config.default_originate.route_map is vyos_defined }}
-{%       endif %}
-{%       if afi_config.distribute_list.export is vyos_defined %}
+{%         endif %}
+{%         if afi_config.distribute_list.export is vyos_defined %}
   neighbor {{ neighbor }} distribute-list {{ afi_config.distribute_list.export }} out
-{%       endif %}
-{%       if afi_config.distribute_list.import is vyos_defined %}
+{%         endif %}
+{%         if afi_config.distribute_list.import is vyos_defined %}
   neighbor {{ neighbor }} distribute-list {{ afi_config.distribute_list.import }} in
-{%       endif %}
-{%       if afi_config.filter_list.export is vyos_defined %}
+{%         endif %}
+{%         if afi_config.filter_list.export is vyos_defined %}
   neighbor {{ neighbor }} filter-list {{ afi_config.filter_list.export }} out
-{%       endif %}
-{%       if afi_config.filter_list.import is vyos_defined %}
+{%         endif %}
+{%         if afi_config.filter_list.import is vyos_defined %}
   neighbor {{ neighbor }} filter-list {{ afi_config.filter_list.import }} in
-{%       endif %}
-{%       if afi_config.maximum_prefix is vyos_defined %}
+{%         endif %}
+{%         if afi_config.maximum_prefix is vyos_defined %}
   neighbor {{ neighbor }} maximum-prefix {{ afi_config.maximum_prefix }}
-{%       endif %}
-{%       if afi_config.maximum_prefix_out is vyos_defined %}
+{%         endif %}
+{%         if afi_config.maximum_prefix_out is vyos_defined %}
   neighbor {{ neighbor }} maximum-prefix-out {{ afi_config.maximum_prefix_out }}
-{%       endif %}
-{%       if afi_config.nexthop_self is vyos_defined %}
+{%         endif %}
+{%         if afi_config.nexthop_self is vyos_defined %}
   neighbor {{ neighbor }} next-hop-self {{ 'force' if afi_config.nexthop_self.force is vyos_defined }}
-{%       endif %}
-{%       if afi_config.route_server_client is vyos_defined %}
+{%         endif %}
+{%         if afi_config.route_server_client is vyos_defined %}
   neighbor {{ neighbor }} route-server-client
-{%       endif %}
-{%       if afi_config.route_map.export is vyos_defined %}
+{%         endif %}
+{%         if afi_config.route_map.export is vyos_defined %}
   neighbor {{ neighbor }} route-map {{ afi_config.route_map.export }} out
-{%       endif %}
-{%       if afi_config.route_map.import is vyos_defined %}
+{%         endif %}
+{%         if afi_config.route_map.import is vyos_defined %}
   neighbor {{ neighbor }} route-map {{ afi_config.route_map.import }} in
-{%       endif %}
-{%       if afi_config.prefix_list.export is vyos_defined %}
+{%         endif %}
+{%         if afi_config.prefix_list.export is vyos_defined %}
   neighbor {{ neighbor }} prefix-list  {{ afi_config.prefix_list.export }} out
-{%       endif %}
-{%       if afi_config.prefix_list.import is vyos_defined %}
+{%         endif %}
+{%         if afi_config.prefix_list.import is vyos_defined %}
   neighbor {{ neighbor }} prefix-list  {{ afi_config.prefix_list.import }} in
-{%       endif %}
-{%       if afi_config.soft_reconfiguration.inbound is vyos_defined %}
+{%         endif %}
+{%         if afi_config.soft_reconfiguration.inbound is vyos_defined %}
   neighbor {{ neighbor }} soft-reconfiguration inbound
-{%       endif %}
-{%       if afi_config.unsuppress_map is vyos_defined %}
+{%         endif %}
+{%         if afi_config.unsuppress_map is vyos_defined %}
   neighbor {{ neighbor }} unsuppress-map {{ afi_config.unsuppress_map }}
-{%       endif %}
-{%       if afi_config.disable_send_community.extended is vyos_defined %}
+{%         endif %}
+{%         if afi_config.disable_send_community.extended is vyos_defined %}
  no neighbor {{ neighbor }} send-community extended
-{%       endif %}
-{%       if afi_config.disable_send_community.standard is vyos_defined %}
+{%         endif %}
+{%         if afi_config.disable_send_community.standard is vyos_defined %}
  no neighbor {{ neighbor }} send-community standard
-{%       endif %}
+{%         endif %}
   neighbor {{ neighbor }} activate
  exit-address-family
  !
 {%     endfor %}
-{%   endif %}
+{% endif %}
 {% endmacro %}
 !
 router bgp {{ local_as }} {{ 'vrf ' ~ vrf if vrf is vyos_defined }}
@@ -244,212 +242,212 @@ router bgp {{ local_as }} {{ 'vrf ' ~ vrf if vrf is vyos_defined }}
 {# Workaround for T2100 until we have decided about a migration script #}
  no bgp network import-check
 {% if address_family is vyos_defined %}
-{%   for afi, afi_config in address_family.items() %}
+{%     for afi, afi_config in address_family.items() %}
  !
-{%     if afi == 'ipv4_unicast' %}
+{%         if afi == 'ipv4_unicast' %}
  address-family ipv4 unicast
-{%     elif afi == 'ipv4_multicast' %}
+{%         elif afi == 'ipv4_multicast' %}
  address-family ipv4 multicast
-{%     elif afi == 'ipv4_labeled_unicast' %}
+{%         elif afi == 'ipv4_labeled_unicast' %}
  address-family ipv4 labeled-unicast
-{%     elif afi == 'ipv4_vpn' %}
+{%         elif afi == 'ipv4_vpn' %}
  address-family ipv4 vpn
-{%     elif afi == 'ipv4_flowspec' %}
+{%         elif afi == 'ipv4_flowspec' %}
  address-family ipv4 flowspec
-{%     elif afi == 'ipv6_unicast' %}
+{%         elif afi == 'ipv6_unicast' %}
  address-family ipv6 unicast
-{%     elif afi == 'ipv6_multicast' %}
+{%         elif afi == 'ipv6_multicast' %}
  address-family ipv6 multicast
-{%     elif afi == 'ipv6_labeled_unicast' %}
+{%         elif afi == 'ipv6_labeled_unicast' %}
  address-family ipv6 labeled-unicast
-{%     elif afi == 'ipv6_vpn' %}
+{%         elif afi == 'ipv6_vpn' %}
  address-family ipv6 vpn
-{%     elif afi == 'ipv6_flowspec' %}
+{%         elif afi == 'ipv6_flowspec' %}
  address-family ipv6 flowspec
-{%     elif afi == 'l2vpn_evpn' %}
+{%         elif afi == 'l2vpn_evpn' %}
  address-family l2vpn evpn
-{%     if afi_config.rd is vyos_defined %}
+{%             if afi_config.rd is vyos_defined %}
   rd {{ afi_config.rd }}
-{%     endif %}
-{%     endif %}
-{%     if afi_config.aggregate_address is vyos_defined %}
-{%       for aggregate, aggregate_config in afi_config.aggregate_address.items() %}
+{%             endif %}
+{%         endif %}
+{%         if afi_config.aggregate_address is vyos_defined %}
+{%             for aggregate, aggregate_config in afi_config.aggregate_address.items() %}
   aggregate-address {{ aggregate }}{{ ' as-set' if aggregate_config.as_set is vyos_defined }}{{ ' summary-only' if aggregate_config.summary_only is vyos_defined }}
-{%         if aggregate_config.route_map is vyos_defined %}
+{%                 if aggregate_config.route_map is vyos_defined %}
   aggregate-address {{ aggregate }} route-map {{ aggregate_config.route_map }}
+{%                 endif %}
+{%             endfor %}
 {%         endif %}
-{%       endfor %}
-{%     endif %}
-{%     if afi_config.maximum_paths.ebgp is vyos_defined %}
+{%         if afi_config.maximum_paths.ebgp is vyos_defined %}
   maximum-paths {{ afi_config.maximum_paths.ebgp }}
-{%     endif %}
-{%     if afi_config.maximum_paths.ibgp is vyos_defined %}
+{%         endif %}
+{%         if afi_config.maximum_paths.ibgp is vyos_defined %}
   maximum-paths ibgp {{ afi_config.maximum_paths.ibgp }}
-{%     endif %}
-{%     if afi_config.redistribute is vyos_defined %}
-{%       for protocol in afi_config.redistribute %}
-{%         if protocol == 'table' %}
-  redistribute table {{ afi_config.redistribute[protocol].table }}
-{%         else %}
-{%           set redistribution_protocol = protocol %}
-{%             if protocol == 'ospfv3' %}
-{%               set redistribution_protocol = 'ospf6' %}
-{%             endif %}
-  redistribute {{ redistribution_protocol }}{% if afi_config.redistribute[protocol].metric is vyos_defined %} metric {{ afi_config.redistribute[protocol].metric }}{% endif %}{% if afi_config.redistribute[protocol].route_map is vyos_defined %} route-map {{ afi_config.redistribute[protocol].route_map }}{% endif %}
-{#######   we need this blank line!! #######}
+{%         endif %}
+{%         if afi_config.redistribute is vyos_defined %}
+{%             for protocol, protocol_config in afi_config.redistribute.items() %}
+{%                 if protocol == 'table' %}
+  redistribute table {{ protocol_config.table }}
+{%                 else %}
+{%                     set redistribution_protocol = protocol %}
+{%                     if protocol == 'ospfv3' %}
+{%                         set redistribution_protocol = 'ospf6' %}
+{%                     endif %}
+  redistribute {{ redistribution_protocol }} {{ 'metric ' ~ protocol_config.metric if protocol_config.metric is vyos_defined }} {{ 'route-map ' ~ protocol_config.route_map if protocol_config.route_map is vyos_defined }}
+  {#######   we need this blank line!! #######}
 
+{%                 endif %}
+{%             endfor %}
 {%         endif %}
-{%       endfor %}
-{%     endif %}
-{%     if afi_config.network is vyos_defined %}
-{%       for network in afi_config.network %}
-  network {{ network }}{% if afi_config.network[network].route_map is vyos_defined %} route-map {{ afi_config.network[network].route_map }}{% endif %}{% if afi_config.network[network].backdoor is vyos_defined %} backdoor{% endif %}{% if afi_config.network[network].rd is vyos_defined and afi_config.network[network].label is vyos_defined %} rd {{ afi_config.network[network].rd }} label {{ afi_config.network[network].label }}{% endif %}
+{%         if afi_config.network is vyos_defined %}
+{%             for network, network_config in afi_config.network.items() %}
+  network {{ network }} {{ 'route-map ' ~ network_config.route_map if network_config.route_map is vyos_defined }} {{ 'backdoor' if network_config.backdoor is vyos_defined }} {{ 'rd ' ~ network_config.rd if network_config.rd is vyos_defined }} {{ 'label ' ~ network_config.label if network_config.label is vyos_defined }}
 {#######   we need this blank line!! #######}
 
-{%       endfor %}
-{%     endif %}
-{%     if afi_config.advertise is vyos_defined %}
-{%       for adv_afi, adv_afi_config in afi_config.advertise.items() %}
-{%         if adv_afi_config.unicast is vyos_defined %}
+{%             endfor %}
+{%         endif %}
+{%         if afi_config.advertise is vyos_defined %}
+{%             for adv_afi, adv_afi_config in afi_config.advertise.items() %}
+{%                 if adv_afi_config.unicast is vyos_defined %}
   advertise {{ adv_afi }} unicast {{ 'route-map ' ~ adv_afi_config.unicast.route_map if adv_afi_config.unicast.route_map is vyos_defined }}
+{%                 endif %}
+{%             endfor %}
 {%         endif %}
-{%       endfor %}
-{%     endif %}
-{%     if afi_config.distance.external is vyos_defined and afi_config.distance.internal is vyos_defined and afi_config.distance.local is vyos_defined %}
+{%         if afi_config.distance.external is vyos_defined and afi_config.distance.internal is vyos_defined and afi_config.distance.local is vyos_defined %}
   distance bgp {{ afi_config.distance.external }} {{ afi_config.distance.internal }} {{ afi_config.distance.local }}
-{%     endif %}
-{%     if afi_config.distance.prefix is vyos_defined %}
-{%       for prefix in afi_config.distance.prefix %}
+{%         endif %}
+{%         if afi_config.distance.prefix is vyos_defined %}
+{%             for prefix in afi_config.distance.prefix %}
   distance {{ afi_config.distance.prefix[prefix].distance }} {{ prefix }}
-{%       endfor %}
-{%     endif %}
-{%     if afi_config.export.vpn is vyos_defined %}
+{%             endfor %}
+{%         endif %}
+{%         if afi_config.export.vpn is vyos_defined %}
   export vpn
-{%     endif %}
-{%     if afi_config.import.vpn is vyos_defined %}
+{%         endif %}
+{%         if afi_config.import.vpn is vyos_defined %}
   import vpn
-{%     endif %}
-{%     if afi_config.import.vrf is vyos_defined %}
-{%       for vrf in afi_config.import.vrf %}
+{%         endif %}
+{%         if afi_config.import.vrf is vyos_defined %}
+{%             for vrf in afi_config.import.vrf %}
   import vrf {{ vrf }}
-{%       endfor %}
-{%     endif %}
-{%     if afi_config.label.vpn.export is vyos_defined %}
+{%             endfor %}
+{%         endif %}
+{%         if afi_config.label.vpn.export is vyos_defined %}
   label vpn export {{ afi_config.label.vpn.export }}
-{%     endif %}
-{%     if afi_config.local_install is vyos_defined %}
-{%       for interface in afi_config.local_install.interface %}
+{%         endif %}
+{%         if afi_config.local_install is vyos_defined %}
+{%             for interface in afi_config.local_install.interface %}
   local-install {{ interface }}
-{%       endfor %}
-{%     endif %}
-{%     if afi_config.advertise_all_vni is vyos_defined %}
+{%             endfor %}
+{%         endif %}
+{%         if afi_config.advertise_all_vni is vyos_defined %}
   advertise-all-vni
-{%     endif %}
-{%     if afi_config.advertise_default_gw is vyos_defined %}
+{%         endif %}
+{%         if afi_config.advertise_default_gw is vyos_defined %}
   advertise-default-gw
-{%     endif %}
-{%     if afi_config.advertise_pip is vyos_defined %}
+{%         endif %}
+{%         if afi_config.advertise_pip is vyos_defined %}
   advertise-pip ip {{ afi_config.advertise_pip }}
-{%     endif %}
-{%     if afi_config.advertise_svi_ip is vyos_defined %}
+{%         endif %}
+{%         if afi_config.advertise_svi_ip is vyos_defined %}
   advertise-svi-ip
-{%     endif %}
-{%     if afi_config.rt_auto_derive is vyos_defined %}
+{%         endif %}
+{%         if afi_config.rt_auto_derive is vyos_defined %}
   autort rfc8365-compatible
-{%     endif %}
-{%     if afi_config.flooding.disable is vyos_defined %}
+{%         endif %}
+{%         if afi_config.flooding.disable is vyos_defined %}
   flooding disable
-{%     endif %}
-{%     if afi_config.flooding.head_end_replication is vyos_defined %}
+{%         endif %}
+{%         if afi_config.flooding.head_end_replication is vyos_defined %}
   flooding head-end-replication
-{%     endif %}
-{%     if afi_config.rd.vpn.export is vyos_defined %}
+{%         endif %}
+{%         if afi_config.rd.vpn.export is vyos_defined %}
   rd vpn export {{ afi_config.rd.vpn.export }}
-{%     endif %}
-{%     if afi_config.route_target.vpn.both is vyos_defined %}
+{%         endif %}
+{%         if afi_config.route_target.vpn.both is vyos_defined %}
   route-target vpn both {{ afi_config.route_target.vpn.both }}
-{%     else %}
-{%       if afi_config.route_target.vpn.export is vyos_defined %}
+{%         else %}
+{%             if afi_config.route_target.vpn.export is vyos_defined %}
   route-target vpn export {{ afi_config.route_target.vpn.export }}
-{%       endif %}
-{%       if afi_config.route_target.vpn.import is vyos_defined %}
+{%             endif %}
+{%             if afi_config.route_target.vpn.import is vyos_defined %}
   route-target vpn import {{ afi_config.route_target.vpn.import }}
-{%       endif %}
-{%     endif %}
-{%     if afi_config.route_target.both is vyos_defined %}
+{%             endif %}
+{%         endif %}
+{%         if afi_config.route_target.both is vyos_defined %}
   route-target both {{ afi_config.route_target.both }}
-{%     else %}
-{%       if afi_config.route_target.export is vyos_defined %}
+{%         else %}
+{%             if afi_config.route_target.export is vyos_defined %}
   route-target export {{ afi_config.route_target.export }}
-{%       endif %}
-{%       if afi_config.route_target.import is vyos_defined %}
+{%             endif %}
+{%             if afi_config.route_target.import is vyos_defined %}
   route-target import {{ afi_config.route_target.import }}
-{%       endif %}
-{%     endif %}
-{%     if afi_config.route_map.vpn.export is vyos_defined %}
+{%             endif %}
+{%         endif %}
+{%         if afi_config.route_map.vpn.export is vyos_defined %}
   route-map vpn export {{ afi_config.route_map.vpn.export }}
-{%     endif %}
-{%     if afi_config.route_map.vpn.import is vyos_defined %}
+{%         endif %}
+{%         if afi_config.route_map.vpn.import is vyos_defined %}
   route-map vpn import {{ afi_config.route_map.vpn.import }}
-{%     endif %}
-{%     if afi_config.vni is vyos_defined %}
-{%       for vni, vni_config in afi_config.vni.items() %}
+{%         endif %}
+{%         if afi_config.vni is vyos_defined %}
+{%             for vni, vni_config in afi_config.vni.items() %}
   vni {{ vni }}
-{%         if vni_config.advertise_default_gw is vyos_defined %}
+{%                 if vni_config.advertise_default_gw is vyos_defined %}
    advertise-default-gw
-{%         endif %}
-{%     if vni_config.advertise_svi_ip is vyos_defined %}
+{%                 endif %}
+{%                 if vni_config.advertise_svi_ip is vyos_defined %}
    advertise-svi-ip
-{%     endif %}
-{%     if vni_config.rd is vyos_defined %}
+{%                 endif %}
+{%                 if vni_config.rd is vyos_defined %}
    rd {{ vni_config.rd }}
-{%     endif %}
-{%     if vni_config.route_target.both is vyos_defined %}
+{%                 endif %}
+{%                 if vni_config.route_target.both is vyos_defined %}
    route-target both {{ vni_config.route_target.both }}
-{%     endif %}
-{%     if vni_config.route_target.export is vyos_defined %}
+{%                 endif %}
+{%                 if vni_config.route_target.export is vyos_defined %}
    route-target export {{ vni_config.route_target.export }}
-{%     endif %}
-{%     if vni_config.route_target.import is vyos_defined %}
+{%                 endif %}
+{%                 if vni_config.route_target.import is vyos_defined %}
    route-target import {{ vni_config.route_target.import }}
-{%     endif %}
+{%                 endif %}
   exit-vni
-{%       endfor %}
-{%     endif %}
+{%             endfor %}
+{%         endif %}
  exit-address-family
-{%   endfor %}
+{%     endfor %}
 {% endif %}
  !
 {% if peer_group is vyos_defined %}
-{%   for peer, config in peer_group.items() %}
+{%     for peer, config in peer_group.items() %}
 {{ bgp_neighbor(peer, config, true) }}
-{%   endfor %}
+{%     endfor %}
 {% endif %}
  !
 {% if neighbor is vyos_defined %}
-{%   for peer, config in neighbor.items() %}
+{%     for peer, config in neighbor.items() %}
 {{ bgp_neighbor(peer, config) }}
-{%   endfor %}
+{%     endfor %}
 {% endif %}
  !
 {% if listen.limit is vyos_defined %}
  bgp listen limit {{ listen.limit }}
 {% endif %}
 {% if listen.range is vyos_defined %}
-{%   for prefix, options in listen.range.items() %}
-{%     if options.peer_group is vyos_defined %}
+{%     for prefix, options in listen.range.items() %}
+{%         if options.peer_group is vyos_defined %}
  bgp listen range {{ prefix }} peer-group {{ options.peer_group }}
-{%     endif %}
-{%   endfor %}
+{%         endif %}
+{%     endfor %}
 {% endif %}
 {% if parameters.always_compare_med is vyos_defined %}
  bgp always-compare-med
 {% endif %}
 {% if parameters.bestpath.as_path is vyos_defined %}
-{%   for option in parameters.bestpath.as_path %}
+{%     for option in parameters.bestpath.as_path %}
 {# replace is required for multipath-relax option #}
- bgp bestpath as-path {{ option|replace('_', '-') }}
-{%   endfor %}
+ bgp bestpath as-path {{ option | replace('_', '-') }}
+{%     endfor %}
 {% endif %}
 {% if parameters.bestpath.bandwidth is vyos_defined %}
  bgp bestpath bandwidth {{ parameters.bestpath.bandwidth }}
@@ -486,9 +484,9 @@ router bgp {{ local_as }} {{ 'vrf ' ~ vrf if vrf is vyos_defined }}
   distance bgp {{ parameters.distance.global.external }} {{ parameters.distance.global.internal }} {{ parameters.distance.global.local }}
 {% endif %}
 {% if parameters.distance.prefix is vyos_defined %}
-{%   for prefix in parameters.distance.prefix %}
+{%     for prefix in parameters.distance.prefix %}
   distance {{ parameters.distance.prefix[prefix].distance }} {{ prefix }}
-{%   endfor %}
+{%     endfor %}
 {% endif %}
 {% if parameters.fast_convergence is vyos_defined %}
   bgp fast-convergence
diff --git a/data/templates/frr/igmp.frr.j2 b/data/templates/frr/igmp.frr.j2
new file mode 100644
index 000000000..ce1f8fdda
--- /dev/null
+++ b/data/templates/frr/igmp.frr.j2
@@ -0,0 +1,41 @@
+!
+{% for iface in old_ifaces %}
+interface {{ iface }}
+{%     for group in old_ifaces[iface].gr_join %}
+{%         if old_ifaces[iface].gr_join[group] %}
+{%             for source in old_ifaces[iface].gr_join[group] %}
+ no ip igmp join {{ group }} {{ source }}
+{%             endfor %}
+{%         else %}
+ no ip igmp join {{ group }}
+{%         endif %}
+{%     endfor %}
+ no ip igmp
+!
+{% endfor %}
+{% for interface, interface_config in ifaces.items() %}
+interface {{ interface }}
+{%     if interface_config.version %}
+ ip igmp version {{ interface_config.version }}
+{%     else %}
+{# IGMP default version 3 #}
+ ip igmp
+{%     endif %}
+{%     if interface_config.query_interval %}
+ ip igmp query-interval {{ interface_config.query_interval }}
+{%     endif %}
+{%     if interface_config.query_max_resp_time %}
+ ip igmp query-max-response-time {{ interface_config.query_max_resp_time }}
+{%     endif %}
+{%     for group in interface_config.gr_join %}
+{%         if ifaces[iface].gr_join[group] %}
+{%             for source in ifaces[iface].gr_join[group] %}
+ ip igmp join {{ group }} {{ source }}
+{%             endfor %}
+{%         else %}
+ ip igmp join {{ group }}
+{%         endif %}
+{%     endfor %}
+!
+{% endfor %}
+!
diff --git a/data/templates/frr/igmp.frr.tmpl b/data/templates/frr/igmp.frr.tmpl
deleted file mode 100644
index 49b5aeaa5..000000000
--- a/data/templates/frr/igmp.frr.tmpl
+++ /dev/null
@@ -1,41 +0,0 @@
-!
-{% for iface in old_ifaces %}
-interface {{ iface }}
-{%   for group in old_ifaces[iface].gr_join %}
-{%     if old_ifaces[iface].gr_join[group] %}
-{%       for source in old_ifaces[iface].gr_join[group] %}
- no ip igmp join {{ group }} {{ source }}
-{%       endfor %}
-{%     else %}
- no ip igmp join {{ group }}
-{%     endif %}
-{%   endfor %}
- no ip igmp
-!
-{% endfor %}
-{% for iface in ifaces %}
-interface {{ iface }}
-{%   if ifaces[iface].version %}
- ip igmp version {{ ifaces[iface].version }}
-{%   else %}
-{# IGMP default version 3 #}
- ip igmp
-{%   endif %}
-{%   if ifaces[iface].query_interval %}
- ip igmp query-interval {{ ifaces[iface].query_interval }}
-{%   endif %}
-{%   if ifaces[iface].query_max_resp_time %}
- ip igmp query-max-response-time {{ ifaces[iface].query_max_resp_time }}
-{%   endif %}
-{%   for group in ifaces[iface].gr_join %}
-{%     if ifaces[iface].gr_join[group] %}
-{%       for source in ifaces[iface].gr_join[group] %}
- ip igmp join {{ group }} {{ source }}
-{%       endfor %}
-{%     else %}
- ip igmp join {{ group }}
-{%     endif %}
-{%   endfor %}
-!
-{% endfor %}
-!
diff --git a/data/templates/frr/isisd.frr.tmpl b/data/templates/frr/isisd.frr.j2
index 238541903..8e95348bc 100644
--- a/data/templates/frr/isisd.frr.tmpl
+++ b/data/templates/frr/isisd.frr.j2
@@ -1,53 +1,53 @@
 !
 {% if interface is vyos_defined %}
-{%   for iface, iface_config in interface.items() %}
+{%     for iface, iface_config in interface.items() %}
 interface {{ iface }}
  ip router isis VyOS
  ipv6 router isis VyOS
-{%     if iface_config.bfd is vyos_defined %}
+{%         if iface_config.bfd is vyos_defined %}
  isis bfd
-{%       if iface_config.bfd.profile is vyos_defined %}
+{%             if iface_config.bfd.profile is vyos_defined %}
  isis bfd profile {{ iface_config.bfd.profile }}
-{%       endif %}
-{%     endif %}
-{%     if iface_config.network.point_to_point is vyos_defined %}
+{%             endif %}
+{%         endif %}
+{%         if iface_config.network.point_to_point is vyos_defined %}
  isis network point-to-point
-{%     endif %}
-{%     if iface_config.circuit_type is vyos_defined %}
+{%         endif %}
+{%         if iface_config.circuit_type is vyos_defined %}
  isis circuit-type {{ iface_config.circuit_type }}
-{%     endif %}
-{%     if iface_config.hello_interval is vyos_defined %}
+{%         endif %}
+{%         if iface_config.hello_interval is vyos_defined %}
  isis hello-interval {{ iface_config.hello_interval }}
-{%     endif %}
-{%     if iface_config.hello_multiplier is vyos_defined %}
+{%         endif %}
+{%         if iface_config.hello_multiplier is vyos_defined %}
  isis hello-multiplier {{ iface_config.hello_multiplier }}
-{%     endif %}
-{%     if iface_config.hello_padding is vyos_defined %}
+{%         endif %}
+{%         if iface_config.hello_padding is vyos_defined %}
  isis hello padding
-{%     endif %}
-{%     if iface_config.metric is vyos_defined %}
+{%         endif %}
+{%         if iface_config.metric is vyos_defined %}
  isis metric {{ iface_config.metric }}
-{%     endif %}
-{%     if iface_config.passive is vyos_defined %}
+{%         endif %}
+{%         if iface_config.passive is vyos_defined %}
  isis passive
-{%     endif %}
-{%     if iface_config.password.md5 is vyos_defined %}
+{%         endif %}
+{%         if iface_config.password.md5 is vyos_defined %}
  isis password md5 {{ iface_config.password.md5 }}
-{%     elif iface_config.password.plaintext_password is vyos_defined %}
+{%         elif iface_config.password.plaintext_password is vyos_defined %}
  isis password clear {{ iface_config.password.plaintext_password }}
-{%     endif %}
-{%     if iface_config.priority is vyos_defined %}
+{%         endif %}
+{%         if iface_config.priority is vyos_defined %}
  isis priority {{ iface_config.priority }}
-{%     endif %}
-{%     if iface_config.psnp_interval is vyos_defined %}
+{%         endif %}
+{%         if iface_config.psnp_interval is vyos_defined %}
  isis psnp-interval {{ iface_config.psnp_interval }}
-{%     endif %}
-{%     if iface_config.no_three_way_handshake is vyos_defined %}
+{%         endif %}
+{%         if iface_config.no_three_way_handshake is vyos_defined %}
  no isis three-way-handshake
-{%     endif %}
+{%         endif %}
 exit
 !
-{%   endfor %}
+{%     endfor %}
 {% endif %}
 !
 router isis VyOS {{ 'vrf ' + vrf if vrf is vyos_defined }}
@@ -94,58 +94,58 @@ router isis VyOS {{ 'vrf ' + vrf if vrf is vyos_defined }}
  mpls-te router-address {{ traffic_engineering.address }}
 {% endif %}
 {% if traffic_engineering.inter_as is vyos_defined %}
-{%   set level = '' %}
-{%   if traffic_engineering.inter_as.level_1 is vyos_defined %}
-{%     set level = ' level-1' %}
-{%   endif %}
-{%   if traffic_engineering.inter_as.level_1_2 is vyos_defined %}
-{%     set level = ' level-1-2' %}
-{%   endif %}
-{%   if traffic_engineering.inter_as.level_2 is vyos_defined %}
-{%     set level = ' level-2-only' %}
-{%   endif %}
+{%     set level = '' %}
+{%     if traffic_engineering.inter_as.level_1 is vyos_defined %}
+{%         set level = ' level-1' %}
+{%     endif %}
+{%     if traffic_engineering.inter_as.level_1_2 is vyos_defined %}
+{%         set level = ' level-1-2' %}
+{%     endif %}
+{%     if traffic_engineering.inter_as.level_2 is vyos_defined %}
+{%         set level = ' level-2-only' %}
+{%     endif %}
  mpls-te inter-as{{ level }}
 {% endif %}
 {% if segment_routing is vyos_defined %}
-{%   if segment_routing.enable is vyos_defined %}
+{%     if segment_routing.enable is vyos_defined %}
  segment-routing on
-{%   endif %}
-{%   if segment_routing.maximum_label_depth is vyos_defined %}
+{%     endif %}
+{%     if segment_routing.maximum_label_depth is vyos_defined %}
  segment-routing node-msd {{ segment_routing.maximum_label_depth }}
-{%   endif %}
-{%   if segment_routing.global_block is vyos_defined %}
-{%     if segment_routing.local_block is vyos_defined %}
+{%     endif %}
+{%     if segment_routing.global_block is vyos_defined %}
+{%         if segment_routing.local_block is vyos_defined %}
  segment-routing global-block {{ segment_routing.global_block.low_label_value }} {{ segment_routing.global_block.high_label_value }} local-block {{ segment_routing.local_block.low_label_value }} {{ segment_routing.local_block.high_label_value }}
-{%     else %}
+{%         else %}
  segment-routing global-block {{ segment_routing.global_block.low_label_value }} {{ segment_routing.global_block.high_label_value }}
-{%     endif %}
-{%   endif %}
-{%   if segment_routing.prefix is vyos_defined %}
-{%     for prefixes in segment_routing.prefix %}
-{%       if segment_routing.prefix[prefixes].absolute is vyos_defined %}
-{%         if segment_routing.prefix[prefixes].absolute.value is vyos_defined %}
- segment-routing prefix {{ prefixes }} absolute {{ segment_routing.prefix[prefixes].absolute.value }}
-{%           if segment_routing.prefix[prefixes].absolute.explicit_null is vyos_defined %}
- segment-routing prefix {{ prefixes }} absolute {{ segment_routing.prefix[prefixes].absolute.value }} explicit-null
-{%           endif %}
-{%           if segment_routing.prefix[prefixes].absolute.no_php_flag is vyos_defined %}
- segment-routing prefix {{ prefixes }} absolute {{ segment_routing.prefix[prefixes].absolute.value }} no-php-flag
-{%           endif %}
 {%         endif %}
-{%         if segment_routing.prefix[prefixes].index is vyos_defined %}
-{%           if segment_routing.prefix[prefixes].index.value is vyos_defined %}
- segment-routing prefix {{ prefixes }} index {{ segment_routing.prefix[prefixes].index.value }}
-{%             if segment_routing.prefix[prefixes].index.explicit_null is vyos_defined %}
- segment-routing prefix {{ prefixes }} index {{ segment_routing.prefix[prefixes].index.value }} explicit-null
-{%             endif %}
-{%             if segment_routing.prefix[prefixes].index.no_php_flag is vyos_defined %}
- segment-routing prefix {{ prefixes }} index {{ segment_routing.prefix[prefixes].index.value }} no-php-flag
+{%     endif %}
+{%     if segment_routing.prefix is vyos_defined %}
+{%         for prefix, prefix_config in segment_routing.prefix.items() %}
+{%             if prefix_config.absolute is vyos_defined %}
+{%                 if prefix_config.absolute.value is vyos_defined %}
+ segment-routing prefix {{ prefixes }} absolute {{ prefix_config.absolute.value }}
+{%                     if prefix_config.absolute.explicit_null is vyos_defined %}
+ segment-routing prefix {{ prefixes }} absolute {{ prefix_config.absolute.value }} explicit-null
+{%                     endif %}
+{%                     if prefix_config.absolute.no_php_flag is vyos_defined %}
+ segment-routing prefix {{ prefixes }} absolute {{ prefix_config.absolute.value }} no-php-flag
+{%                     endif %}
+{%                 endif %}
+{%                 if prefix_config.index is vyos_defined %}
+{%                     if prefix_config.index.value is vyos_defined %}
+ segment-routing prefix {{ prefixes }} index {{ prefix_config.index.value }}
+{%                         if prefix_config.index.explicit_null is vyos_defined %}
+ segment-routing prefix {{ prefixes }} index {{ prefix_config.index.value }} explicit-null
+{%                         endif %}
+{%                         if prefix_config.index.no_php_flag is vyos_defined %}
+ segment-routing prefix {{ prefixes }} index {{ prefix_config.index.value }} no-php-flag
+{%                         endif %}
+{%                     endif %}
+{%                 endif %}
 {%             endif %}
-{%           endif %}
-{%         endif %}
-{%       endif %}
-{%     endfor %}
-{%   endif %}
+{%         endfor %}
+{%     endif %}
 {% endif %}
 {% if spf_delay_ietf.init_delay is vyos_defined %}
  spf-delay-ietf init-delay {{ spf_delay_ietf.init_delay }} short-delay {{ spf_delay_ietf.short_delay }} long-delay {{ spf_delay_ietf.long_delay }} holddown {{ spf_delay_ietf.holddown }} time-to-learn {{ spf_delay_ietf.time_to_learn }}
@@ -156,37 +156,37 @@ router isis VyOS {{ 'vrf ' + vrf if vrf is vyos_defined }}
  area-password clear {{ area_password.plaintext_password }}
 {% endif %}
 {% if default_information.originate is vyos_defined %}
-{%   for afi, afi_config in default_information.originate.items() %}
-{%     for level, level_config in afi_config.items() %}
+{%     for afi, afi_config in default_information.originate.items() %}
+{%         for level, level_config in afi_config.items() %}
  default-information originate {{ afi }} {{ level | replace('_', '-') }} {{ 'always' if level_config.always is vyos_defined }} {{ 'route-map ' ~ level_config.route_map if level_config.route_map is vyos_defined }} {{ 'metric ' ~ level_config.metric if level_config.metric is vyos_defined }}
+{%         endfor %}
 {%     endfor %}
-{%   endfor %}
 {% endif %}
 {% if redistribute.ipv4 is vyos_defined %}
-{%   for protocol, protocol_options in redistribute.ipv4.items() %}
-{%     for level, level_config in protocol_options.items() %}
-{%       if level_config.metric is vyos_defined %}
+{%     for protocol, protocol_options in redistribute.ipv4.items() %}
+{%         for level, level_config in protocol_options.items() %}
+{%             if level_config.metric is vyos_defined %}
  redistribute ipv4 {{ protocol }} {{ level | replace('_', '-') }} metric {{ level_config.metric }}
-{%       elif level_config.route_map is vyos_defined %}
+{%             elif level_config.route_map is vyos_defined %}
  redistribute ipv4 {{ protocol }} {{ level | replace('_', '-') }} route-map {{ level_config.route_map }}
-{%       else %}
+{%             else %}
  redistribute ipv4 {{ protocol }} {{ level | replace('_', '-') }}
-{%       endif %}
+{%             endif %}
+{%         endfor %}
 {%     endfor %}
-{%   endfor %}
 {% endif %}
 {% if redistribute.ipv6 is vyos_defined %}
-{%   for protocol, protocol_options in redistribute.ipv6.items() %}
-{%     for level, level_config in protocol_options.items() %}
-{%       if level_config.metric is vyos_defined %}
+{%     for protocol, protocol_options in redistribute.ipv6.items() %}
+{%         for level, level_config in protocol_options.items() %}
+{%             if level_config.metric is vyos_defined %}
  redistribute ipv6 {{ protocol }} {{ level | replace('_', '-') }} metric {{ level_config.metric }}
-{%       elif level_config.route_map is vyos_defined %}
+{%             elif level_config.route_map is vyos_defined %}
  redistribute ipv6 {{ protocol }} {{ level | replace('_', '-') }} route-map {{ level_config.route_map }}
-{%       else %}
+{%             else %}
  redistribute ipv6 {{ protocol }} {{ level | replace('_', '-') }}
-{%       endif %}
+{%             endif %}
+{%         endfor %}
 {%     endfor %}
-{%   endfor %}
 {% endif %}
 {% if level is vyos_defined('level-2') %}
  is-type level-2-only
diff --git a/data/templates/frr/ldpd.frr.j2 b/data/templates/frr/ldpd.frr.j2
new file mode 100644
index 000000000..11aff331a
--- /dev/null
+++ b/data/templates/frr/ldpd.frr.j2
@@ -0,0 +1,149 @@
+!
+{% if ldp is vyos_defined %}
+mpls ldp
+{%     if ldp.router_id is vyos_defined %}
+ router-id {{ ldp.router_id }}
+{%     endif %}
+{%     if ldp.parameters.cisco_interop_tlv is vyos_defined %}
+ dual-stack cisco-interop
+{%     endif %}
+{%     if ldp.parameters.transport_prefer_ipv4 is vyos_defined %}
+ dual-stack transport-connection prefer ipv4
+{%     endif %}
+{%     if ldp.parameters.ordered_control is vyos_defined %}
+ ordered-control
+{%     endif %}
+{%     if ldp.neighbor is vyos_defined %}
+{%         for neighbor, neighbor_config in ldp.neighbor %}
+{%             if neighbor_config.password is vyos_defined %}
+ neighbor {{ neighbors }} password {{ neighbor_config.password }}
+{%             endif %}
+{%             if neighbor_config.ttl_security is vyos_defined %}
+{%                 if neighbor_config.ttl_security.disable is vyos_defined %}
+ neighbor {{ neighbors }} ttl-security disable
+{%                 else %}
+ neighbor {{ neighbors }} ttl-security hops {{ neighbor_config.ttl_security }}
+{%                 endif %}
+{%             endif %}
+{%             if neighbor_config.session_holdtime is vyos_defined %}
+ neighbor {{ neighbors }} session holdtime {{ neighbor_config.session_holdtime }}
+{%             endif %}
+{%         endfor %}
+{%     endif %}
+ !
+{%     if ldp.discovery.transport_ipv4_address is vyos_defined %}
+ address-family ipv4
+{%         if ldp.allocation.ipv4.access_list is vyos_defined %}
+  label local allocate for {{ ldp.allocation.ipv4.access_list }}
+{%         else %}
+  label local allocate host-routes
+{%         endif %}
+{%         if ldp.discovery.transport_ipv4_address is vyos_defined %}
+  discovery transport-address {{ ldp.discovery.transport_ipv4_address }}
+{%         endif %}
+{%         if ldp.discovery.hello_ipv4_holdtime is vyos_defined %}
+  discovery hello holdtime {{ ldp.discovery.hello_ipv4_holdtime }}
+{%         endif %}
+{%         if ldp.discovery.hello_ipv4_interval is vyos_defined %}
+  discovery hello interval {{ ldp.discovery.hello_ipv4_interval }}
+{%         endif %}
+{%         if ldp.discovery.session_ipv4_holdtime is vyos_defined %}
+  session holdtime {{ ldp.discovery.session_ipv4_holdtime }}
+{%         endif %}
+{%         if ldp.import.ipv4.import_filter.filter_access_list is vyos_defined %}
+{%             if ldp.import.ipv4.import_filter.neighbor_access_list is vyos_defined %}
+  label remote accept for {{ ldp.import.ipv4.import_filter.filter_access_list }} from {{ ldp.import.ipv4.import_filter.neighbor_access_list }}
+{%             else %}
+  label remote accept for {{ ldp.import.ipv4.import_filter.filter_access_list }}
+{%             endif %}
+{%         endif %}
+{%         if ldp.export.ipv4.explicit_null is vyos_defined %}
+  label local advertise explicit-null
+{%         endif %}
+{%         if ldp.export.ipv4.export_filter.filter_access_list is vyos_defined %}
+{%             if ldp.export.ipv4.export_filter.neighbor_access_list is vyos_defined %}
+  label local advertise for {{ ldp.export.ipv4.export_filter.filter_access_list }} to {{ ldp.export.ipv4.export_filter.neighbor_access_list }}
+{%             else %}
+  label local advertise for {{ ldp.export.ipv4.export_filter.filter_access_list }}
+{%             endif %}
+{%         endif %}
+{%         if ldp.targeted_neighbor is vyos_defined %}
+{%             if ldp.targeted_neighbor.ipv4.enable is vyos_defined %}
+  discovery targeted-hello accept
+{%             endif %}
+{%             if ldp.targeted_neighbor.ipv4.hello_holdtime is vyos_defined %}
+  discovery targeted-hello holdtime {{ ldp.targeted_neighbor.ipv4.hello_holdtime }}
+{%             endif %}
+{%             if ldp.targeted_neighbor.ipv4.hello_interval is vyos_defined %}
+  discovery targeted-hello interval {{ ldp.targeted_neighbor.ipv4.hello_interval }}
+{%             endif %}
+{%             for addresses in ldp.targeted_neighbor.ipv4.address %}
+  neighbor {{ addresses }} targeted
+{%             endfor %}
+{%         endif %}
+{%         if ldp.interface is vyos_defined %}
+{%             for interface in ldp.interface %}
+  interface {{ interface }}
+  exit
+{%             endfor %}
+{%         endif %}
+ exit-address-family
+{%     else %}
+ no address-family ipv4
+{%     endif %}
+ !
+{%     if ldp.discovery.transport_ipv6_address is vyos_defined %}
+ address-family ipv6
+{%         if ldp.allocation.ipv6.access_list6 is vyos_defined %}
+  label local allocate for {{ ldp.allocation.ipv6.access_list6 }}
+{%         else %}
+  label local allocate host-routes
+{%         endif %}
+{%         if ldp.discovery.transport_ipv6_address is vyos_defined %}
+  discovery transport-address {{ ldp.discovery.transport_ipv6_address }}
+{%         endif %}
+{%         if ldp.discovery.hello_ipv6_holdtime is vyos_defined %}
+  discovery hello holdtime {{ ldp.discovery.hello_ipv6_holdtime }}
+{%         endif %}
+{%         if ldp.discovery.hello_ipv6_interval is vyos_defined %}
+  discovery hello interval {{ ldp.discovery.hello_ipv6_interval }}
+{%         endif %}
+{%         if ldp.discovery.session_ipv6_holdtime is vyos_defined %}
+  session holdtime {{ ldp.discovery.session_ipv6_holdtime }}
+{%         endif %}
+{%         if ldp.import.ipv6.import_filter.filter_access_list6 is vyos_defined %}
+  label remote accept for {{ ldp.import.ipv6.import_filter.filter_access_list6 }} {{ 'from ' ~ ldp.import.ipv6.import_filter.neighbor_access_list6 if ldp.import.ipv6.import_filter.neighbor_access_list6 is vyos_defined }}
+{%         endif %}
+{%         if ldp.export.ipv6.explicit_null is vyos_defined %}
+  label local advertise explicit-null
+{%         endif %}
+{%         if ldp.export.ipv6.export_filter.filter_access_list6 is vyos_defined %}
+  label local advertise for {{ ldp.export.ipv6.export_filter.filter_access_list6 }} {{ 'to ' ~ ldp.export.ipv6.export_filter.neighbor_access_list6 if ldp.export.ipv6.export_filter.neighbor_access_list6 is vyos_defined }}
+{%         endif %}
+{%         if ldp.targeted_neighbor is vyos_defined %}
+{%             if ldp.targeted_neighbor.ipv6.enable is vyos_defined %}
+  discovery targeted-hello accept
+{%             endif %}
+{%             if ldp.targeted_neighbor.ipv6.hello_holdtime is vyos_defined %}
+  discovery targeted-hello holdtime {{ ldp.targeted_neighbor.ipv6.hello_holdtime }}
+{%             endif %}
+{%             if ldp.targeted_neighbor.ipv6.hello_interval is vyos_defined %}
+  discovery targeted-hello interval {{ ldp.targeted_neighbor.ipv6.hello_interval }}
+{%             endif %}
+{%             for addresses in ldp.targeted_neighbor.ipv6.address %}
+  neighbor {{ addresses }} targeted
+{%             endfor %}
+{%         endif %}
+{%         if ldp.interface is vyos_defined %}
+{%             for interface in ldp.interface %}
+  interface {{ interface }}
+{%             endfor %}
+{%         endif %}
+ exit-address-family
+{%     else %}
+ no address-family ipv6
+{%     endif %}
+ !
+exit
+{% endif %}
+!
diff --git a/data/templates/frr/ldpd.frr.tmpl b/data/templates/frr/ldpd.frr.tmpl
deleted file mode 100644
index 5a67b5cdf..000000000
--- a/data/templates/frr/ldpd.frr.tmpl
+++ /dev/null
@@ -1,157 +0,0 @@
-!
-{% if ldp is vyos_defined %}
-mpls ldp
-{%   if ldp.router_id is vyos_defined %}
- router-id {{ ldp.router_id }}
-{%   endif %}
-{%   if ldp.parameters.cisco_interop_tlv is vyos_defined %}
- dual-stack cisco-interop
-{%   endif %}
-{%   if ldp.parameters.transport_prefer_ipv4 is vyos_defined %}
- dual-stack transport-connection prefer ipv4
-{%   endif %}
-{%   if ldp.parameters.ordered_control is vyos_defined %}
- ordered-control
-{%   endif %}
-{%   if ldp.neighbor is vyos_defined %}
-{%     for neighbor, neighbor_config in ldp.neighbor %}
-{%       if neighbor_config.password is vyos_defined %}
- neighbor {{ neighbors }} password {{ neighbor_config.password }}
-{%       endif %}
-{%       if neighbor_config.ttl_security is vyos_defined %}
-{%         if neighbor_config.ttl_security.disable is vyos_defined%}
- neighbor {{ neighbors }} ttl-security disable
-{%         else %}
- neighbor {{ neighbors }} ttl-security hops {{ neighbor_config.ttl_security }}
-{%         endif %}
-{%       endif %}
-{%       if neighbor_config.session_holdtime is vyos_defined %}
- neighbor {{ neighbors }} session holdtime {{ neighbor_config.session_holdtime }}
-{%       endif %}
-{%     endfor %}
-{%   endif %}
- !
-{%   if ldp.discovery.transport_ipv4_address is vyos_defined %}
- address-family ipv4
-{%     if ldp.allocation.ipv4.access_list is vyos_defined %}
-  label local allocate for {{ ldp.allocation.ipv4.access_list }}
-{%     else %}
-  label local allocate host-routes
-{%     endif %}
-{%     if ldp.discovery.transport_ipv4_address is vyos_defined %}
-  discovery transport-address {{ ldp.discovery.transport_ipv4_address }}
-{%     endif %}
-{%     if ldp.discovery.hello_ipv4_holdtime is vyos_defined %}
-  discovery hello holdtime {{ ldp.discovery.hello_ipv4_holdtime }}
-{%     endif %}
-{%     if ldp.discovery.hello_ipv4_interval is vyos_defined %}
-  discovery hello interval {{ ldp.discovery.hello_ipv4_interval }}
-{%     endif %}
-{%     if ldp.discovery.session_ipv4_holdtime is vyos_defined %}
-  session holdtime {{ ldp.discovery.session_ipv4_holdtime }}
-{%     endif %}
-{%     if ldp.import.ipv4.import_filter.filter_access_list is vyos_defined %}
-{%       if ldp.import.ipv4.import_filter.neighbor_access_list is vyos_defined %}
-  label remote accept for {{ ldp.import.ipv4.import_filter.filter_access_list }} from {{ ldp.import.ipv4.import_filter.neighbor_access_list }}
-{%       else %}
-  label remote accept for {{ ldp.import.ipv4.import_filter.filter_access_list }}
-{%       endif %}
-{%     endif %}
-{%     if ldp.export.ipv4.explicit_null is vyos_defined %}
-  label local advertise explicit-null
-{%     endif %}
-{%     if ldp.export.ipv4.export_filter.filter_access_list is vyos_defined %}
-{%       if ldp.export.ipv4.export_filter.neighbor_access_list is vyos_defined %}
-  label local advertise for {{ ldp.export.ipv4.export_filter.filter_access_list }} to {{ ldp.export.ipv4.export_filter.neighbor_access_list }}
-{%       else %}
-  label local advertise for {{ ldp.export.ipv4.export_filter.filter_access_list }}
-{%       endif %}
-{%     endif %}
-{%     if ldp.targeted_neighbor is vyos_defined %}
-{%       if ldp.targeted_neighbor.ipv4.enable is vyos_defined %}
-  discovery targeted-hello accept
-{%       endif %}
-{%       if ldp.targeted_neighbor.ipv4.hello_holdtime is vyos_defined %}
-  discovery targeted-hello holdtime {{ ldp.targeted_neighbor.ipv4.hello_holdtime }}
-{%       endif %}
-{%       if ldp.targeted_neighbor.ipv4.hello_interval is vyos_defined %}
-  discovery targeted-hello interval {{ ldp.targeted_neighbor.ipv4.hello_interval }}
-{%       endif %}
-{%       for addresses in ldp.targeted_neighbor.ipv4.address %}
-  neighbor {{ addresses }} targeted
-{%       endfor %}
-{%     endif %}
-{%     if ldp.interface is vyos_defined %}
-{%       for interface in ldp.interface %}
-  interface {{ interface }}
-  exit
-{%       endfor %}
-{%     endif %}
- exit-address-family
-{%   else %}
- no address-family ipv4
-{%   endif %}
- !
-{%   if ldp.discovery.transport_ipv6_address is vyos_defined %}
- address-family ipv6
-{%     if ldp.allocation.ipv6.access_list6 is vyos_defined %}
-  label local allocate for {{ ldp.allocation.ipv6.access_list6 }}
-{%     else %}
-  label local allocate host-routes
-{%     endif %}
-{%     if ldp.discovery.transport_ipv6_address is vyos_defined %}
-  discovery transport-address {{ ldp.discovery.transport_ipv6_address }}
-{%     endif %}
-{%     if ldp.discovery.hello_ipv6_holdtime is vyos_defined %}
-  discovery hello holdtime {{ ldp.discovery.hello_ipv6_holdtime }}
-{%     endif %}
-{%     if ldp.discovery.hello_ipv6_interval is vyos_defined %}
-  discovery hello interval {{ ldp.discovery.hello_ipv6_interval }}
-{%     endif %}
-{%     if ldp.discovery.session_ipv6_holdtime is vyos_defined %}
-  session holdtime {{ ldp.discovery.session_ipv6_holdtime }}
-{%     endif %}
-{%     if ldp.import.ipv6.import_filter.filter_access_list6 is vyos_defined %}
-{%       if ldp.import.ipv6.import_filter.neighbor_access_list6 is vyos_defined %}
-  label remote accept for {{ ldp.import.ipv6.import_filter.filter_access_list6 }} from {{ ldp.import.ipv6.import_filter.neighbor_access_list6 }}
-{%       else %}
-  label remote accept for {{ ldp.import.ipv6.import_filter.filter_access_list6 }}
-{%       endif %}
-{%     endif %}
-{%     if ldp.export.ipv6.explicit_null is vyos_defined %}
-  label local advertise explicit-null
-{%     endif %}
-{%     if ldp.export.ipv6.export_filter.filter_access_list6 is vyos_defined %}
-{%       if ldp.export.ipv6.export_filter.neighbor_access_list6 is vyos_defined %}
-  label local advertise for {{ ldp.export.ipv6.export_filter.filter_access_list6 }} to {{ ldp.export.ipv6.export_filter.neighbor_access_list6 }}
-{%       else %}
-  label local advertise for {{ ldp.export.ipv6.export_filter.filter_access_list6 }}
-{%       endif %}
-{%     endif %}
-{%     if ldp.targeted_neighbor is vyos_defined %}
-{%       if ldp.targeted_neighbor.ipv6.enable is vyos_defined %}
-  discovery targeted-hello accept
-{%       endif %}
-{%       if ldp.targeted_neighbor.ipv6.hello_holdtime is vyos_defined %}
-  discovery targeted-hello holdtime {{ ldp.targeted_neighbor.ipv6.hello_holdtime }}
-{%       endif %}
-{%       if ldp.targeted_neighbor.ipv6.hello_interval is vyos_defined %}
-  discovery targeted-hello interval {{ ldp.targeted_neighbor.ipv6.hello_interval }}
-{%       endif %}
-{%       for addresses in ldp.targeted_neighbor.ipv6.address %}
-  neighbor {{ addresses }} targeted
-{%       endfor %}
-{%     endif %}
-{%     if ldp.interface is vyos_defined %}
-{%       for interface in ldp.interface %}
-  interface {{ interface }}
-{%       endfor %}
-{%     endif %}
- exit-address-family
-{%   else %}
- no address-family ipv6
-{%   endif %}
- !
-exit
-{% endif %}
-!
diff --git a/data/templates/frr/ospf6d.frr.tmpl b/data/templates/frr/ospf6d.frr.j2
index 325f05213..84394ed1a 100644
--- a/data/templates/frr/ospf6d.frr.tmpl
+++ b/data/templates/frr/ospf6d.frr.j2
@@ -1,84 +1,84 @@
 !
 {% if interface is vyos_defined %}
-{%   for iface, iface_config in interface.items() %}
+{%     for iface, iface_config in interface.items() %}
 interface {{ iface }}
-{%     if iface_config.area is vyos_defined %}
+{%         if iface_config.area is vyos_defined %}
  ipv6 ospf6 area {{ iface_config.area }}
-{%     endif %}
-{%     if iface_config.cost is vyos_defined %}
+{%         endif %}
+{%         if iface_config.cost is vyos_defined %}
  ipv6 ospf6 cost {{ iface_config.cost }}
-{%     endif %}
-{%     if iface_config.priority is vyos_defined %}
+{%         endif %}
+{%         if iface_config.priority is vyos_defined %}
  ipv6 ospf6 priority {{ iface_config.priority }}
-{%     endif %}
-{%     if iface_config.hello_interval is vyos_defined %}
+{%         endif %}
+{%         if iface_config.hello_interval is vyos_defined %}
  ipv6 ospf6 hello-interval {{ iface_config.hello_interval }}
-{%     endif %}
-{%     if iface_config.retransmit_interval is vyos_defined %}
+{%         endif %}
+{%         if iface_config.retransmit_interval is vyos_defined %}
  ipv6 ospf6 retransmit-interval {{ iface_config.retransmit_interval }}
-{%     endif %}
-{%     if iface_config.transmit_delay is vyos_defined %}
+{%         endif %}
+{%         if iface_config.transmit_delay is vyos_defined %}
  ipv6 ospf6 transmit-delay {{ iface_config.transmit_delay }}
-{%     endif %}
-{%     if iface_config.dead_interval is vyos_defined %}
+{%         endif %}
+{%         if iface_config.dead_interval is vyos_defined %}
  ipv6 ospf6 dead-interval {{ iface_config.dead_interval }}
-{%     endif %}
-{%     if iface_config.bfd is vyos_defined %}
+{%         endif %}
+{%         if iface_config.bfd is vyos_defined %}
  ipv6 ospf6 bfd
-{%     endif %}
-{%     if iface_config.bfd.profile is vyos_defined %}
+{%         endif %}
+{%         if iface_config.bfd.profile is vyos_defined %}
  ipv6 ospf6 bfd profile {{ iface_config.bfd.profile }}
-{%     endif %}
-{%     if iface_config.mtu_ignore is vyos_defined %}
+{%         endif %}
+{%         if iface_config.mtu_ignore is vyos_defined %}
  ipv6 ospf6 mtu-ignore
-{%     endif %}
-{%     if iface_config.ifmtu is vyos_defined %}
+{%         endif %}
+{%         if iface_config.ifmtu is vyos_defined %}
  ipv6 ospf6 ifmtu {{ iface_config.ifmtu }}
-{%     endif %}
-{%     if iface_config.network is vyos_defined %}
+{%         endif %}
+{%         if iface_config.network is vyos_defined %}
  ipv6 ospf6 network {{ iface_config.network }}
-{%     endif %}
-{%     if iface_config.instance_id is vyos_defined %}
+{%         endif %}
+{%         if iface_config.instance_id is vyos_defined %}
  ipv6 ospf6 instance-id {{ iface_config.instance_id }}
-{%     endif %}
-{%     if iface_config.passive is vyos_defined %}
+{%         endif %}
+{%         if iface_config.passive is vyos_defined %}
  ipv6 ospf6 passive
-{%     endif %}
+{%         endif %}
 exit
 !
-{%   endfor %}
+{%     endfor %}
 {% endif %}
 !
 router ospf6 {{ 'vrf ' ~ vrf if vrf is vyos_defined }}
 {% if area is vyos_defined %}
-{%   for area_id, area_config in area.items() %}
-{%     if area_config.area_type is vyos_defined %}
-{%       for type, type_config in area_config.area_type.items() %}
+{%     for area_id, area_config in area.items() %}
+{%         if area_config.area_type is vyos_defined %}
+{%             for type, type_config in area_config.area_type.items() %}
  area {{ area_id }} {{ type }} {{ 'default-information-originate' if type_config.default_information_originate is vyos_defined }} {{ 'no-summary' if type_config.no_summary is vyos_defined }}
-{%       endfor %}
-{%     endif %}
-{%     if area_config.range is vyos_defined %}
-{%       for prefix, prefix_config in area_config.range.items() %}
+{%             endfor %}
+{%         endif %}
+{%         if area_config.range is vyos_defined %}
+{%             for prefix, prefix_config in area_config.range.items() %}
  area {{ area_id }} range {{ prefix }} {{ 'advertise' if prefix_config.advertise is vyos_defined }} {{ 'not-advertise' if prefix_config.not_advertise is vyos_defined }}
-{%       endfor %}
-{%     endif %}
-{%     if area_config.export_list is vyos_defined %}
+{%             endfor %}
+{%         endif %}
+{%         if area_config.export_list is vyos_defined %}
  area {{ area_id }} export-list {{ area_config.export_list }}
-{%     endif %}
-{%     if area_config.import_list is vyos_defined %}
+{%         endif %}
+{%         if area_config.import_list is vyos_defined %}
  area {{ area_id }} import-list {{ area_config.import_list }}
-{%     endif %}
-{%   endfor %}
+{%         endif %}
+{%     endfor %}
 {% endif %}
  auto-cost reference-bandwidth {{ auto_cost.reference_bandwidth }}
 {% if default_information.originate is vyos_defined %}
- default-information originate {{ 'always' if default_information.originate.always is vyos_defined }} {{ 'metric ' + default_information.originate.metric if default_information.originate.metric is vyos_defined }} {{ 'metric-type ' + default_information.originate.metric_type if default_information.originate.metric_type is vyos_defined }} {{ 'route-map ' + default_information.originate.route_map if default_information.originate.route_map is vyos_defined }}
+ default-information originate {{ 'always' if default_information.originate.always is vyos_defined }} {{ 'metric ' ~ default_information.originate.metric if default_information.originate.metric is vyos_defined }} {{ 'metric-type ' ~ default_information.originate.metric_type if default_information.originate.metric_type is vyos_defined }} {{ 'route-map ' ~ default_information.originate.route_map if default_information.originate.route_map is vyos_defined }}
 {% endif %}
 {% if distance.global is vyos_defined %}
  distance {{ distance.global }}
 {% endif %}
 {% if distance.ospfv3 is vyos_defined %}
- distance ospf6 {{ 'intra-area ' + distance.ospfv3.intra_area if distance.ospfv3.intra_area is vyos_defined }} {{ 'inter-area ' + distance.ospfv3.inter_area if distance.ospfv3.inter_area is vyos_defined }} {{ 'external ' + distance.ospfv3.external if distance.ospfv3.external is vyos_defined }}
+ distance ospf6 {{ 'intra-area ' ~ distance.ospfv3.intra_area if distance.ospfv3.intra_area is vyos_defined }} {{ 'inter-area ' ~ distance.ospfv3.inter_area if distance.ospfv3.inter_area is vyos_defined }} {{ 'external ' ~ distance.ospfv3.external if distance.ospfv3.external is vyos_defined }}
 {% endif %}
 {% if log_adjacency_changes is vyos_defined %}
  log-adjacency-changes {{ "detail" if log_adjacency_changes.detail is vyos_defined }}
@@ -87,9 +87,9 @@ router ospf6 {{ 'vrf ' ~ vrf if vrf is vyos_defined }}
  ospf6 router-id {{ parameters.router_id }}
 {% endif %}
 {% if redistribute is vyos_defined %}
-{%   for protocol, options in redistribute.items() %}
- redistribute {{ protocol }} {{ 'route-map ' + options.route_map if options.route_map is vyos_defined }}
-{%   endfor %}
+{%     for protocol, options in redistribute.items() %}
+ redistribute {{ protocol }} {{ 'route-map ' ~ options.route_map if options.route_map is vyos_defined }}
+{%     endfor %}
 {% endif %}
 exit
 !
diff --git a/data/templates/frr/ospfd.frr.tmpl b/data/templates/frr/ospfd.frr.j2
index 7c6738181..427fc8be7 100644
--- a/data/templates/frr/ospfd.frr.tmpl
+++ b/data/templates/frr/ospfd.frr.j2
@@ -1,123 +1,123 @@
 !
 {% if interface is vyos_defined %}
-{%   for iface, iface_config in interface.items() %}
+{%     for iface, iface_config in interface.items() %}
 interface {{ iface }}
-{%     if iface_config.authentication.plaintext_password is vyos_defined %}
+{%         if iface_config.authentication.plaintext_password is vyos_defined %}
  ip ospf authentication-key {{ iface_config.authentication.plaintext_password }}
-{%     elif iface_config.authentication.md5 is vyos_defined %}
+{%         elif iface_config.authentication.md5 is vyos_defined %}
  ip ospf authentication message-digest
-{%       if iface_config.authentication.md5.key_id is vyos_defined %}
-{%         for key, key_config in iface_config.authentication.md5.key_id.items() %}
+{%             if iface_config.authentication.md5.key_id is vyos_defined %}
+{%                 for key, key_config in iface_config.authentication.md5.key_id.items() %}
  ip ospf message-digest-key {{ key }} md5 {{ key_config.md5_key }}
-{%         endfor %}
-{%       endif %}
-{%     endif %}
-{%     if iface_config.area is vyos_defined %}
+{%                 endfor %}
+{%             endif %}
+{%         endif %}
+{%         if iface_config.area is vyos_defined %}
  ip ospf area {{ iface_config.area }}
-{%     endif %}
-{%     if iface_config.bandwidth is vyos_defined %}
+{%         endif %}
+{%         if iface_config.bandwidth is vyos_defined %}
  bandwidth {{ iface_config.bandwidth }}
-{%     endif %}
-{%     if iface_config.cost is vyos_defined %}
+{%         endif %}
+{%         if iface_config.cost is vyos_defined %}
  ip ospf cost {{ iface_config.cost }}
-{%     endif %}
-{%     if iface_config.priority is vyos_defined %}
+{%         endif %}
+{%         if iface_config.priority is vyos_defined %}
  ip ospf priority {{ iface_config.priority }}
-{%     endif %}
-{%     if iface_config.hello_interval is vyos_defined %}
+{%         endif %}
+{%         if iface_config.hello_interval is vyos_defined %}
  ip ospf hello-interval {{ iface_config.hello_interval }}
-{%     endif %}
-{%     if iface_config.retransmit_interval is vyos_defined %}
+{%         endif %}
+{%         if iface_config.retransmit_interval is vyos_defined %}
  ip ospf retransmit-interval {{ iface_config.retransmit_interval }}
-{%     endif %}
-{%     if iface_config.transmit_delay is vyos_defined %}
+{%         endif %}
+{%         if iface_config.transmit_delay is vyos_defined %}
  ip ospf transmit-delay {{ iface_config.transmit_delay }}
-{%     endif %}
-{%     if iface_config.dead_interval is vyos_defined %}
+{%         endif %}
+{%         if iface_config.dead_interval is vyos_defined %}
  ip ospf dead-interval {{ iface_config.dead_interval }}
-{%     elif iface_config.hello_multiplier is vyos_defined %}
+{%         elif iface_config.hello_multiplier is vyos_defined %}
  ip ospf dead-interval minimal hello-multiplier {{ iface_config.hello_multiplier }}
-{%     endif %}
-{%     if iface_config.bfd is vyos_defined %}
+{%         endif %}
+{%         if iface_config.bfd is vyos_defined %}
  ip ospf bfd
-{%     endif %}
-{%     if iface_config.bfd.profile is vyos_defined %}
+{%         endif %}
+{%         if iface_config.bfd.profile is vyos_defined %}
  ip ospf bfd profile {{ iface_config.bfd.profile }}
-{%     endif %}
-{%     if iface_config.mtu_ignore is vyos_defined %}
+{%         endif %}
+{%         if iface_config.mtu_ignore is vyos_defined %}
  ip ospf mtu-ignore
-{%     endif %}
-{%     if iface_config.network is vyos_defined %}
+{%         endif %}
+{%         if iface_config.network is vyos_defined %}
  ip ospf network {{ iface_config.network }}
-{%     endif %}
-{%     if iface_config.passive is vyos_defined %}
+{%         endif %}
+{%         if iface_config.passive is vyos_defined %}
  {{ 'no ' if iface_config.passive.disable is vyos_defined }}ip ospf passive
-{%     endif %}
+{%         endif %}
 exit
 !
-{%   endfor %}
+{%     endfor %}
 {% endif %}
 !
 router ospf {{ 'vrf ' ~ vrf if vrf is vyos_defined }}
 {% if access_list is vyos_defined %}
-{%   for acl, acl_config in access_list.items() %}
-{%     for protocol in acl_config.export if acl_config.export is vyos_defined %}
+{%     for acl, acl_config in access_list.items() %}
+{%         for protocol in acl_config.export if acl_config.export is vyos_defined %}
  distribute-list {{ acl }} out {{ protocol }}
+{%         endfor %}
 {%     endfor %}
-{%   endfor %}
 {% endif %}
 {% if area is vyos_defined %}
-{%   for area_id, area_config in area.items() %}
-{%     if area_config.area_type is vyos_defined %}
-{%       for type, type_config in area_config.area_type.items() if type != 'normal' %}
+{%     for area_id, area_config in area.items() %}
+{%         if area_config.area_type is vyos_defined %}
+{%             for type, type_config in area_config.area_type.items() if type != 'normal' %}
  area {{ area_id }} {{ type }} {{ 'no-summary' if type_config.no_summary is vyos_defined }}
-{%         if type_config.default_cost is vyos_defined %}
+{%                 if type_config.default_cost is vyos_defined %}
  area {{ area_id }} default-cost {{ type_config.default_cost }}
+{%                 endif %}
+{%             endfor %}
 {%         endif %}
-{%       endfor %}
-{%     endif %}
-{%     if area_config.authentication is vyos_defined %}
+{%         if area_config.authentication is vyos_defined %}
  area {{ area_id }} authentication {{ 'message-digest' if area_config.authentication is vyos_defined('md5') }}
-{%     endif %}
-{%     for network in area_config.network if area_config.network is vyos_defined %}
+{%         endif %}
+{%         for network in area_config.network if area_config.network is vyos_defined %}
  network {{ network }} area {{ area_id }}
-{%     endfor %}
-{%     if area_config.range is vyos_defined %}
-{%       for range, range_config in area_config.range.items() %}
-{%         if range_config.cost is vyos_defined %}
+{%         endfor %}
+{%         if area_config.range is vyos_defined %}
+{%             for range, range_config in area_config.range.items() %}
+{%                 if range_config.cost is vyos_defined %}
  area {{ area_id }} range {{ range }} cost {{ range_config.cost }}
-{%         endif %}
-{%         if range_config.not_advertise is vyos_defined %}
+{%                 endif %}
+{%                 if range_config.not_advertise is vyos_defined %}
  area {{ area_id }} range {{ range }} not-advertise
-{%         endif %}
-{%         if range_config.substitute is vyos_defined %}
+{%                 endif %}
+{%                 if range_config.substitute is vyos_defined %}
  area {{ area_id }} range {{ range }} substitute {{ range_config.substitute }}
+{%                 endif %}
+{%             endfor %}
 {%         endif %}
-{%       endfor %}
-{%     endif %}
-{%     if area_config.export_list is vyos_defined %}
+{%         if area_config.export_list is vyos_defined %}
  area {{ area_id }} export-list {{ area_config.export_list }}
-{%     endif %}
-{%     if area_config.import_list is vyos_defined %}
+{%         endif %}
+{%         if area_config.import_list is vyos_defined %}
  area {{ area_id }} import-list {{ area_config.import_list }}
-{%     endif %}
-{%     if area_config.shortcut is vyos_defined %}
+{%         endif %}
+{%         if area_config.shortcut is vyos_defined %}
  area {{ area_id }} shortcut {{ area_config.shortcut }}
-{%     endif %}
-{%     if area_config.virtual_link is vyos_defined %}
-{%       for link, link_config in area_config.virtual_link.items() %}
-{%         if link_config.authentication.plaintext_password is vyos_defined %}
+{%         endif %}
+{%         if area_config.virtual_link is vyos_defined %}
+{%             for link, link_config in area_config.virtual_link.items() %}
+{%                 if link_config.authentication.plaintext_password is vyos_defined %}
  area {{ area_id }} virtual-link {{ link }} authentication-key {{ link_config.authentication.plaintext_password }}
-{%         elif link_config.authentication.md5.key_id is vyos_defined %}
-{%           for key, key_config in link_config.authentication.md5.key_id.items() %}
+{%                 elif link_config.authentication.md5.key_id is vyos_defined %}
+{%                     for key, key_config in link_config.authentication.md5.key_id.items() %}
  area {{ area_id }} virtual-link {{ link }} message-digest-key {{ key }} md5 {{ key_config.md5_key }}
-{%           endfor %}
-{%         endif %}
+{%                     endfor %}
+{%                 endif %}
 {#         The following values are default values #}
  area {{ area_id }} virtual-link {{ link }} hello-interval {{ link_config.hello_interval }} retransmit-interval {{ link_config.retransmit_interval }} transmit-delay {{ link_config.transmit_delay }} dead-interval {{ link_config.dead_interval }}
-{%       endfor %}
-{%     endif %}
-{%   endfor %}
+{%             endfor %}
+{%         endif %}
+{%     endfor %}
 {% endif %}
 {% if auto_cost.reference_bandwidth is vyos_defined %}
  auto-cost reference-bandwidth {{ auto_cost.reference_bandwidth }}
@@ -154,9 +154,9 @@ router ospf {{ 'vrf ' ~ vrf if vrf is vyos_defined }}
  mpls-te router-address {{ mpls_te.router_address }}
 {% endif %}
 {% if neighbor is vyos_defined %}
-{%   for address, address_config in neighbor.items() %}
+{%     for address, address_config in neighbor.items() %}
  neighbor {{ address }} {{ 'priority ' + address_config.priority if address_config.priority is vyos_defined }} {{ 'poll-interval ' + address_config.poll_interval if address_config.poll_interval is vyos_defined }}
-{%   endfor %}
+{%     endfor %}
 {% endif %}
 {% if parameters.abr_type is vyos_defined %}
  ospf abr-type {{ parameters.abr_type }}
@@ -168,15 +168,15 @@ router ospf {{ 'vrf ' ~ vrf if vrf is vyos_defined }}
  passive-interface default
 {% endif %}
 {% if redistribute is vyos_defined %}
-{%   for protocol, protocols_options in redistribute.items() %}
-{%     if protocol == 'table' %}
-{%       for table, table_options in protocols_options.items() %}
+{%     for protocol, protocols_options in redistribute.items() %}
+{%         if protocol == 'table' %}
+{%             for table, table_options in protocols_options.items() %}
  redistribute {{ protocol }} {{ table }} {{ 'metric ' + table_options.metric if table_options.metric is vyos_defined }} {{ 'metric-type ' + table_options.metric_type if table_options.metric_type is vyos_defined }} {{ 'route-map ' + table_options.route_map if table_options.route_map is vyos_defined }}
-{%       endfor %}
-{%     else %}
+{%             endfor %}
+{%         else %}
  redistribute {{ protocol }} {{ 'metric ' + protocols_options.metric if protocols_options.metric is vyos_defined }} {{ 'metric-type ' + protocols_options.metric_type if protocols_options.metric_type is vyos_defined }} {{ 'route-map ' + protocols_options.route_map if protocols_options.route_map is vyos_defined }}
-{%     endif %}
-{%   endfor %}
+{%         endif %}
+{%     endfor %}
 {% endif %}
 {% if refresh.timers is vyos_defined %}
  refresh timer {{ refresh.timers }}
diff --git a/data/templates/frr/pimd.frr.tmpl b/data/templates/frr/pimd.frr.j2
index a5b56223a..cb2f2aa98 100644
--- a/data/templates/frr/pimd.frr.tmpl
+++ b/data/templates/frr/pimd.frr.j2
@@ -1,8 +1,8 @@
 !
 {% for rp_addr in old_pim.rp %}
-{% for group in old_pim.rp[rp_addr] %}
+{%     for group in old_pim.rp[rp_addr] %}
 no ip pim rp {{ rp_addr }} {{ group }}
-{% endfor %}
+{%     endfor %}
 {% endfor %}
 {% if old_pim.rp_keep_alive %}
 no ip pim rp keep-alive-timer {{ old_pim.rp_keep_alive }}
@@ -15,18 +15,18 @@ no ip pim
 {% for iface in pim.ifaces %}
 interface {{ iface }}
 ip pim
-{% if pim.ifaces[iface].dr_prio %}
+{%     if pim.ifaces[iface].dr_prio %}
 ip pim drpriority {{ pim.ifaces[iface].dr_prio }}
-{% endif %}
-{% if pim.ifaces[iface].hello %}
+{%     endif %}
+{%     if pim.ifaces[iface].hello %}
 ip pim hello {{ pim.ifaces[iface].hello }}
-{% endif %}
+{%     endif %}
 !
 {% endfor %}
 {% for rp_addr in pim.rp %}
-{% for group in pim.rp[rp_addr] %}
+{%     for group in pim.rp[rp_addr] %}
 ip pim rp {{ rp_addr }} {{ group }}
-{% endfor %}
+{%     endfor %}
 {% endfor %}
 {% if pim.rp_keep_alive %}
 ip pim rp keep-alive-timer {{ pim.rp_keep_alive }}
diff --git a/data/templates/frr/policy.frr.j2 b/data/templates/frr/policy.frr.j2
new file mode 100644
index 000000000..9f3097f82
--- /dev/null
+++ b/data/templates/frr/policy.frr.j2
@@ -0,0 +1,322 @@
+{% if access_list is vyos_defined %}
+{%     for acl, acl_config in access_list.items() | natural_sort %}
+{%         if acl_config.description is vyos_defined %}
+access-list {{ acl }} remark {{ acl_config.description }}
+{%         endif %}
+{%         if acl_config.rule is vyos_defined %}
+{%             for rule, rule_config in acl_config.rule.items() | natural_sort %}
+{%                 set ip = '' %}
+{%                 set src = '' %}
+{%                 set src_mask = '' %}
+{%                 if rule_config.source.any is vyos_defined %}
+{%                     set src = 'any' %}
+{%                 elif rule_config.source.host is vyos_defined %}
+{%                     set src = 'host ' ~ rule_config.source.host %}
+{%                 elif rule_config.source.network is vyos_defined %}
+{%                     set src = rule_config.source.network %}
+{%                     set src_mask = rule_config.source.inverse_mask %}
+{%                 endif %}
+{%                 set dst = '' %}
+{%                 set dst_mask = '' %}
+{%                 if (acl | int >= 100 and acl | int <= 199) or (acl | int >= 2000 and acl | int <= 2699) %}
+{%                     set ip = 'ip' %}
+{%                     set dst = 'any' %}
+{%                     if rule_config.destination.any is vyos_defined %}
+{%                         set dst = 'any' %}
+{%                     elif rule_config.destination.host is vyos_defined %}
+{%                         set dst = 'host ' ~ rule_config.destination.host %}
+{%                     elif rule_config.destination.network is vyos_defined %}
+{%                         set dst = rule_config.destination.network %}
+{%                         set dst_mask = rule_config.destination.inverse_mask %}
+{%                     endif %}
+{%                 endif %}
+access-list {{ acl }} seq {{ rule }} {{ rule_config.action }} {{ ip }} {{ src }} {{ src_mask }} {{ dst }} {{ dst_mask }}
+{%             endfor %}
+{%         endif %}
+{%     endfor %}
+{% endif %}
+!
+{% if access_list6 is vyos_defined %}
+{%     for acl, acl_config in access_list6.items() | natural_sort %}
+{%         if acl_config.description is vyos_defined %}
+ipv6 access-list {{ acl }} remark {{ acl_config.description }}
+{%         endif %}
+{%         if acl_config.rule is vyos_defined %}
+{%             for rule, rule_config in acl_config.rule.items() | natural_sort %}
+{%                 set src = '' %}
+{%                 if rule_config.source.any is vyos_defined %}
+{%                     set src = 'any' %}
+{%                 elif rule_config.source.network is vyos_defined %}
+{%                     set src = rule_config.source.network %}
+{%                 endif %}
+ipv6 access-list {{ acl }} seq {{ rule }} {{ rule_config.action }} {{ src }} {{ 'exact-match' if rule_config.source.exact_match is vyos_defined }}
+{%             endfor %}
+{%         endif %}
+{%     endfor %}
+{% endif %}
+!
+{% if as_path_list is vyos_defined %}
+{%     for acl, acl_config in as_path_list.items() | natural_sort %}
+{%         if acl_config.rule is vyos_defined %}
+{%             for rule, rule_config in acl_config.rule.items() | natural_sort %}
+bgp as-path access-list {{ acl }} seq {{ rule }} {{ rule_config.action }} {{ rule_config.regex }}
+{%             endfor %}
+{%         endif %}
+{%     endfor %}
+{% endif %}
+!
+{% if community_list is vyos_defined %}
+{%     for list, list_config in community_list.items() | natural_sort %}
+{%         if list_config.rule is vyos_defined %}
+{%             for rule, rule_config in list_config.rule.items() | natural_sort %}
+{#                 by default, if casting to int fails it returns 0 #}
+{%                 if list | int != 0 %}
+bgp community-list {{ list }} seq {{ rule }} {{ rule_config.action }} {{ rule_config.regex }}
+{%                 else %}
+bgp community-list expanded {{ list }} seq {{ rule }} {{ rule_config.action }} {{ rule_config.regex }}
+{%                 endif %}
+{%             endfor %}
+{%         endif %}
+{%     endfor %}
+{% endif %}
+!
+{% if extcommunity_list is vyos_defined %}
+{%     for list, list_config in extcommunity_list.items() | natural_sort %}
+{%         if list_config.rule is vyos_defined %}
+{%             for rule, rule_config in list_config.rule.items() | natural_sort %}
+{#                 by default, if casting to int fails it returns 0 #}
+{%                 if list | int != 0 %}
+bgp extcommunity-list {{ list }} seq {{ rule }} {{ rule_config.action }} {{ rule_config.regex }}
+{%                 else %}
+bgp extcommunity-list expanded {{ list }} seq {{ rule }} {{ rule_config.action }} {{ rule_config.regex }}
+{%                 endif %}
+{%             endfor %}
+{%         endif %}
+{%     endfor %}
+{% endif %}
+!
+{% if large_community_list is vyos_defined %}
+{%     for list, list_config in large_community_list.items() | natural_sort %}
+{%         if list_config.rule is vyos_defined %}
+{%             for rule, rule_config in list_config.rule.items() | natural_sort %}
+{#                 by default, if casting to int fails it returns 0 #}
+{%                 if list | int != 0 %}
+bgp large-community-list {{ list }} seq {{ rule }} {{ rule_config.action }} {{ rule_config.regex }}
+{%                 else %}
+bgp large-community-list expanded {{ list }} seq {{ rule }} {{ rule_config.action }} {{ rule_config.regex }}
+{%                 endif %}
+{%             endfor %}
+{%         endif %}
+{%     endfor %}
+{% endif %}
+!
+{% if prefix_list is vyos_defined %}
+{%     for prefix_list, prefix_list_config in prefix_list.items() | natural_sort %}
+{%         if prefix_list_config.description is vyos_defined %}
+ip prefix-list {{ prefix_list }} description {{ prefix_list_config.description }}
+{%         endif %}
+{%         if prefix_list_config.rule is vyos_defined %}
+{%             for rule, rule_config in prefix_list_config.rule.items() | natural_sort %}
+{%                 if rule_config.prefix is vyos_defined %}
+ip prefix-list {{ prefix_list }} seq {{ rule }} {{ rule_config.action }} {{ rule_config.prefix }} {{ 'ge ' ~ rule_config.ge if rule_config.ge is vyos_defined }} {{ 'le ' ~ rule_config.le if rule_config.le is vyos_defined }}
+{%                 endif %}
+{%             endfor %}
+{%         endif %}
+{%     endfor %}
+{% endif %}
+!
+{% if prefix_list6 is vyos_defined %}
+{%     for prefix_list, prefix_list_config in prefix_list6.items() | natural_sort %}
+{%         if prefix_list_config.description is vyos_defined %}
+ipv6 prefix-list {{ prefix_list }} description {{ prefix_list_config.description }}
+{%         endif %}
+{%         if prefix_list_config.rule is vyos_defined %}
+{%             for rule, rule_config in prefix_list_config.rule.items() | natural_sort %}
+{%                 if rule_config.prefix is vyos_defined %}
+ipv6 prefix-list {{ prefix_list }} seq {{ rule }} {{ rule_config.action }} {{ rule_config.prefix }} {{ 'ge ' ~ rule_config.ge if rule_config.ge is vyos_defined }} {{ 'le ' ~ rule_config.le if rule_config.le is vyos_defined }}
+{%                 endif %}
+{%             endfor %}
+{%         endif %}
+{%     endfor %}
+{% endif %}
+!
+{% if route_map is vyos_defined %}
+{%     for route_map, route_map_config in route_map.items() | natural_sort %}
+{%         if route_map_config.rule is vyos_defined %}
+{%             for rule, rule_config in route_map_config.rule.items() | natural_sort %}
+route-map {{ route_map }} {{ rule_config.action }} {{ rule }}
+{%                 if rule_config.call is vyos_defined %}
+ call {{ rule_config.call }}
+{%                 endif %}
+{%                 if rule_config.continue is vyos_defined %}
+ on-match goto {{ rule_config.continue }}
+{%                 endif %}
+{%                 if rule_config.description is vyos_defined %}
+ description {{ rule_config.description }}
+{%                 endif %}
+{%                 if rule_config.match is vyos_defined %}
+{%                     if rule_config.match.as_path is vyos_defined %}
+ match as-path {{ rule_config.match.as_path }}
+{%                     endif %}
+{%                     if rule_config.match.community.community_list is vyos_defined %}
+ match community {{ rule_config.match.community.community_list }} {{ 'exact-match' if rule_config.match.community.exact_match is vyos_defined }}
+{%                     endif %}
+{%                     if rule_config.match.extcommunity is vyos_defined %}
+ match extcommunity {{ rule_config.match.extcommunity }}
+{%                     endif %}
+{%                     if rule_config.match.evpn.default_route is vyos_defined %}
+ match evpn default-route
+{%                     endif %}
+{%                     if rule_config.match.evpn.rd is vyos_defined %}
+ match evpn rd {{ rule_config.match.evpn.rd }}
+{%                     endif %}
+{%                     if rule_config.match.evpn.route_type is vyos_defined %}
+ match evpn route-type {{ rule_config.match.evpn.route_type }}
+{%                     endif %}
+{%                     if rule_config.match.evpn.vni is vyos_defined %}
+ match evpn vni {{ rule_config.match.evpn.vni }}
+{%                     endif %}
+{%                     if rule_config.match.interface is vyos_defined %}
+ match interface {{ rule_config.match.interface }}
+{%                     endif %}
+{%                     if rule_config.match.ip.address.access_list is vyos_defined %}
+ match ip address {{ rule_config.match.ip.address.access_list }}
+{%                     endif %}
+{%                     if rule_config.match.ip.address.prefix_list is vyos_defined %}
+ match ip address prefix-list {{ rule_config.match.ip.address.prefix_list }}
+{%                     endif %}
+{%                     if rule_config.match.ip.nexthop.access_list is vyos_defined %}
+ match ip next-hop {{ rule_config.match.ip.nexthop.access_list }}
+{%                     endif %}
+{%                     if rule_config.match.ip.nexthop.prefix_list is vyos_defined %}
+ match ip next-hop prefix-list {{ rule_config.match.ip.nexthop.prefix_list }}
+{%                     endif %}
+{%                     if rule_config.match.ip.route_source.access_list is vyos_defined %}
+ match ip route-source {{ rule_config.match.ip.route_source.access_list }}
+{%                     endif %}
+{%                     if rule_config.match.ip.route_source.prefix_list is vyos_defined %}
+ match ip route-source prefix-list {{ rule_config.match.ip.route_source.prefix_list }}
+{%                     endif %}
+{%                     if rule_config.match.ipv6.address.access_list is vyos_defined %}
+ match ipv6 address {{ rule_config.match.ipv6.address.access_list }}
+{%                     endif %}
+{%                     if rule_config.match.ipv6.address.prefix_list is vyos_defined %}
+ match ipv6 address prefix-list {{ rule_config.match.ipv6.address.prefix_list }}
+{%                     endif %}
+{%                     if rule_config.match.ipv6.nexthop is vyos_defined %}
+ match ipv6 next-hop address {{ rule_config.match.ipv6.nexthop }}
+{%                     endif %}
+{%                     if rule_config.match.large_community.large_community_list is vyos_defined %}
+ match large-community {{ rule_config.match.large_community.large_community_list }}
+{%                     endif %}
+{%                     if rule_config.match.local_preference is vyos_defined %}
+ match local-preference {{ rule_config.match.local_preference }}
+{%                     endif %}
+{%                     if rule_config.match.metric is vyos_defined %}
+ match metric {{ rule_config.match.metric }}
+{%                     endif %}
+{%                     if rule_config.match.origin is vyos_defined %}
+ match origin {{ rule_config.match.origin }}
+{%                     endif %}
+{%                     if rule_config.match.peer is vyos_defined %}
+ match peer {{ rule_config.match.peer }}
+{%                     endif %}
+{%                     if rule_config.match.rpki is vyos_defined %}
+ match rpki {{ rule_config.match.rpki }}
+{%                     endif %}
+{%                     if rule_config.match.tag is vyos_defined %}
+ match tag {{ rule_config.match.tag }}
+{%                     endif %}
+{%                 endif %}
+{%                 if rule_config.on_match.next is vyos_defined %}
+ on-match next
+{%                 endif %}
+{%                 if rule_config.on_match.goto is vyos_defined %}
+ on-match goto {{ rule_config.on_match.goto }}
+{%                 endif %}
+{%                 if rule_config.set is vyos_defined %}
+{%                     if rule_config.set.aggregator.as is vyos_defined and rule_config.set.aggregator.ip is vyos_defined %}
+ set aggregator as {{ rule_config.set.aggregator.as }} {{ rule_config.set.aggregator.ip }}
+{%                     endif %}
+{%                     if rule_config.set.as_path_exclude is vyos_defined %}
+ set as-path exclude {{ rule_config.set.as_path_exclude }}
+{%                     endif %}
+{%                     if rule_config.set.as_path_prepend is vyos_defined %}
+ set as-path prepend {{ rule_config.set.as_path_prepend }}
+{%                     endif %}
+{%                     if rule_config.set.atomic_aggregate is vyos_defined %}
+ set atomic-aggregate
+{%                     endif %}
+{%                     if rule_config.set.comm_list.comm_list is vyos_defined %}
+ set comm-list {{ rule_config.set.comm_list.comm_list }} {{ 'delete' if rule_config.set.comm_list.delete is vyos_defined }}
+{%                     endif %}
+{%                     if rule_config.set.community is vyos_defined %}
+ set community {{ rule_config.set.community }}
+{%                     endif %}
+{%                     if rule_config.set.distance is vyos_defined %}
+ set distance {{ rule_config.set.distance }}
+{%                     endif %}
+{%                     if rule_config.set.extcommunity.bandwidth is vyos_defined %}
+ set extcommunity bandwidth {{ rule_config.set.extcommunity.bandwidth }}
+{%                     endif %}
+{%                     if rule_config.set.extcommunity.rt is vyos_defined %}
+ set extcommunity rt {{ rule_config.set.extcommunity.rt }}
+{%                     endif %}
+{%                     if rule_config.set.extcommunity.soo is vyos_defined %}
+ set extcommunity soo {{ rule_config.set.extcommunity.soo }}
+{%                     endif %}
+{%                     if rule_config.set.ip_next_hop is vyos_defined %}
+ set ip next-hop {{ rule_config.set.ip_next_hop }}
+{%                     endif %}
+{%                     if rule_config.set.ipv6_next_hop.global is vyos_defined %}
+ set ipv6 next-hop global {{ rule_config.set.ipv6_next_hop.global }}
+{%                     endif %}
+{%                     if rule_config.set.ipv6_next_hop.local is vyos_defined %}
+ set ipv6 next-hop local {{ rule_config.set.ipv6_next_hop.local }}
+{%                     endif %}
+{%                     if rule_config.set.ipv6_next_hop.peer_address is vyos_defined %}
+ set ipv6 next-hop peer-address
+{%                     endif %}
+{%                     if rule_config.set.ipv6_next_hop.prefer_global is vyos_defined %}
+ set ipv6 next-hop prefer-global
+{%                     endif %}
+{%                     if rule_config.set.large_community is vyos_defined %}
+ set large-community {{ rule_config.set.large_community }}
+{%                     endif %}
+{%                     if rule_config.set.large_comm_list_delete is vyos_defined %}
+ set large-comm-list {{ rule_config.set.large_comm_list_delete }} delete
+{%                     endif %}
+{%                     if rule_config.set.local_preference is vyos_defined %}
+ set local-preference {{ rule_config.set.local_preference }}
+{%                     endif %}
+{%                     if rule_config.set.metric is vyos_defined %}
+ set metric {{ rule_config.set.metric }}
+{%                     endif %}
+{%                     if rule_config.set.metric_type is vyos_defined %}
+ set metric-type {{ rule_config.set.metric_type }}
+{%                     endif %}
+{%                     if rule_config.set.origin is vyos_defined %}
+ set origin {{ rule_config.set.origin }}
+{%                     endif %}
+{%                     if rule_config.set.originator_id is vyos_defined %}
+ set originator-id {{ rule_config.set.originator_id }}
+{%                     endif %}
+{%                     if rule_config.set.src is vyos_defined %}
+ set src {{ rule_config.set.src }}
+{%                     endif %}
+{%                     if rule_config.set.table is vyos_defined %}
+ set table {{ rule_config.set.table }}
+{%                     endif %}
+{%                     if rule_config.set.tag is vyos_defined %}
+ set tag {{ rule_config.set.tag }}
+{%                     endif %}
+{%                     if rule_config.set.weight is vyos_defined %}
+ set weight {{ rule_config.set.weight }}
+{%                     endif %}
+{%                 endif %}
+exit
+!
+{%             endfor %}
+{%         endif %}
+{%     endfor %}
+{% endif %}
diff --git a/data/templates/frr/policy.frr.tmpl b/data/templates/frr/policy.frr.tmpl
deleted file mode 100644
index 814dbf761..000000000
--- a/data/templates/frr/policy.frr.tmpl
+++ /dev/null
@@ -1,322 +0,0 @@
-{% if access_list is vyos_defined %}
-{%   for acl, acl_config in access_list.items() | natural_sort %}
-{%     if acl_config.description is vyos_defined %}
-access-list {{ acl }} remark {{ acl_config.description }}
-{%     endif %}
-{%     if acl_config.rule is vyos_defined %}
-{%       for rule, rule_config in acl_config.rule.items() | natural_sort %}
-{%         set ip = '' %}
-{%         set src = '' %}
-{%         set src_mask = '' %}
-{%         if rule_config.source.any is vyos_defined %}
-{%           set src = 'any' %}
-{%         elif rule_config.source.host is vyos_defined %}
-{%           set src = 'host ' ~ rule_config.source.host %}
-{%         elif rule_config.source.network is vyos_defined %}
-{%           set src = rule_config.source.network %}
-{%           set src_mask = rule_config.source.inverse_mask %}
-{%         endif %}
-{%         set dst = '' %}
-{%         set dst_mask = '' %}
-{%         if (acl|int >= 100 and acl|int <= 199) or (acl|int >= 2000 and acl|int <= 2699) %}
-{%           set ip = 'ip' %}
-{%           set dst = 'any' %}
-{%           if rule_config.destination.any is vyos_defined %}
-{%             set dst = 'any' %}
-{%           elif rule_config.destination.host is vyos_defined %}
-{%             set dst = 'host ' ~ rule_config.destination.host %}
-{%           elif rule_config.destination.network is vyos_defined %}
-{%             set dst = rule_config.destination.network %}
-{%             set dst_mask = rule_config.destination.inverse_mask %}
-{%           endif %}
-{%         endif %}
-access-list {{ acl }} seq {{ rule }} {{ rule_config.action }} {{ ip }} {{ src }} {{ src_mask }} {{ dst }} {{ dst_mask }}
-{%       endfor %}
-{%     endif %}
-{%   endfor %}
-{% endif %}
-!
-{% if access_list6 is vyos_defined %}
-{%   for acl, acl_config in access_list6.items() | natural_sort %}
-{%     if acl_config.description is vyos_defined %}
-ipv6 access-list {{ acl }} remark {{ acl_config.description }}
-{%     endif %}
-{%     if acl_config.rule is vyos_defined %}
-{%       for rule, rule_config in acl_config.rule.items() | natural_sort %}
-{%         set src = '' %}
-{%         if rule_config.source.any is vyos_defined %}
-{%           set src = 'any' %}
-{%         elif rule_config.source.network is vyos_defined %}
-{%           set src = rule_config.source.network %}
-{%         endif %}
-ipv6 access-list {{ acl }} seq {{ rule }} {{ rule_config.action }} {{ src }} {{ 'exact-match' if rule_config.source.exact_match is vyos_defined }}
-{%       endfor %}
-{%     endif %}
-{%   endfor %}
-{% endif %}
-!
-{% if as_path_list is vyos_defined %}
-{%   for acl, acl_config in as_path_list.items() | natural_sort %}
-{%     if acl_config.rule is vyos_defined %}
-{%       for rule, rule_config in acl_config.rule.items() | natural_sort %}
-bgp as-path access-list {{ acl }} seq {{ rule }} {{ rule_config.action }} {{ rule_config.regex }}
-{%       endfor %}
-{%     endif %}
-{%   endfor %}
-{% endif %}
-!
-{% if community_list is vyos_defined %}
-{%   for list, list_config in community_list.items() | natural_sort %}
-{%     if list_config.rule is vyos_defined %}
-{%       for rule, rule_config in list_config.rule.items() | natural_sort %}
-{#         by default, if casting to int fails it returns 0 #}
-{%         if list|int != 0 %}
-bgp community-list {{ list }} seq {{ rule }} {{ rule_config.action }} {{ rule_config.regex }}
-{%         else %}
-bgp community-list expanded {{ list }} seq {{ rule }} {{ rule_config.action }} {{ rule_config.regex }}
-{%         endif %}
-{%       endfor %}
-{%     endif %}
-{%   endfor %}
-{% endif %}
-!
-{% if extcommunity_list is vyos_defined %}
-{%   for list, list_config in extcommunity_list.items() | natural_sort %}
-{%     if list_config.rule is vyos_defined %}
-{%       for rule, rule_config in list_config.rule.items() | natural_sort %}
-{#         by default, if casting to int fails it returns 0 #}
-{%         if list|int != 0 %}
-bgp extcommunity-list {{ list }} seq {{ rule }} {{ rule_config.action }} {{ rule_config.regex }}
-{%         else %}
-bgp extcommunity-list expanded {{ list }} seq {{ rule }} {{ rule_config.action }} {{ rule_config.regex }}
-{%         endif %}
-{%       endfor %}
-{%     endif %}
-{%   endfor %}
-{% endif %}
-!
-{% if large_community_list is vyos_defined %}
-{%   for list, list_config in large_community_list.items() | natural_sort %}
-{%     if list_config.rule is vyos_defined %}
-{%       for rule, rule_config in list_config.rule.items() | natural_sort %}
-{#         by default, if casting to int fails it returns 0 #}
-{%         if list|int != 0 %}
-bgp large-community-list {{ list }} seq {{ rule }} {{ rule_config.action }} {{ rule_config.regex }}
-{%         else %}
-bgp large-community-list expanded {{ list }} seq {{ rule }} {{ rule_config.action }} {{ rule_config.regex }}
-{%         endif %}
-{%       endfor %}
-{%     endif %}
-{%   endfor %}
-{% endif %}
-!
-{% if prefix_list is vyos_defined %}
-{%   for prefix_list, prefix_list_config in prefix_list.items() | natural_sort %}
-{%     if prefix_list_config.description is vyos_defined %}
-ip prefix-list {{ prefix_list }} description {{ prefix_list_config.description }}
-{%     endif %}
-{%     if prefix_list_config.rule is vyos_defined %}
-{%       for rule, rule_config in prefix_list_config.rule.items() | natural_sort %}
-{%         if rule_config.prefix is vyos_defined %}
-ip prefix-list {{ prefix_list }} seq {{ rule }} {{ rule_config.action }} {{ rule_config.prefix }} {{ 'ge ' ~ rule_config.ge if rule_config.ge is vyos_defined }} {{ 'le ' ~ rule_config.le if rule_config.le is vyos_defined }}
-{%         endif %}
-{%       endfor %}
-{%     endif %}
-{%   endfor %}
-{% endif %}
-!
-{% if prefix_list6 is vyos_defined %}
-{%   for prefix_list, prefix_list_config in prefix_list6.items() | natural_sort %}
-{%     if prefix_list_config.description is vyos_defined %}
-ipv6 prefix-list {{ prefix_list }} description {{ prefix_list_config.description }}
-{%     endif %}
-{%     if prefix_list_config.rule is vyos_defined %}
-{%       for rule, rule_config in prefix_list_config.rule.items() | natural_sort %}
-{%         if rule_config.prefix is vyos_defined %}
-ipv6 prefix-list {{ prefix_list }} seq {{ rule }} {{ rule_config.action }} {{ rule_config.prefix }} {{ 'ge ' ~ rule_config.ge if rule_config.ge is vyos_defined }} {{ 'le ' ~ rule_config.le if rule_config.le is vyos_defined }}
-{%         endif %}
-{%       endfor %}
-{%     endif %}
-{%   endfor %}
-{% endif %}
-!
-{% if route_map is vyos_defined %}
-{%   for route_map, route_map_config in route_map.items() | natural_sort %}
-{%     if route_map_config.rule is vyos_defined %}
-{%       for rule, rule_config in route_map_config.rule.items() | natural_sort %}
-route-map {{ route_map }} {{ rule_config.action }} {{ rule }}
-{%         if rule_config.call is vyos_defined %}
- call {{ rule_config.call }}
-{%         endif %}
-{%         if rule_config.continue is vyos_defined %}
- on-match goto {{ rule_config.continue }}
-{%         endif %}
-{%         if rule_config.description is vyos_defined %}
- description {{ rule_config.description }}
-{%         endif %}
-{%         if rule_config.match is vyos_defined %}
-{%           if rule_config.match.as_path is vyos_defined %}
- match as-path {{ rule_config.match.as_path }}
-{%           endif %}
-{%           if rule_config.match.community.community_list is vyos_defined %}
- match community {{ rule_config.match.community.community_list }} {{ 'exact-match' if rule_config.match.community.exact_match is vyos_defined }}
-{%           endif %}
-{%           if rule_config.match.extcommunity is vyos_defined %}
- match extcommunity {{ rule_config.match.extcommunity }}
-{%           endif %}
-{%           if rule_config.match.evpn.default_route is vyos_defined %}
- match evpn default-route
-{%           endif %}
-{%           if rule_config.match.evpn.rd is vyos_defined %}
- match evpn rd {{ rule_config.match.evpn.rd }}
-{%           endif %}
-{%           if rule_config.match.evpn.route_type is vyos_defined %}
- match evpn route-type {{ rule_config.match.evpn.route_type }}
-{%           endif %}
-{%           if rule_config.match.evpn.vni is vyos_defined %}
- match evpn vni {{ rule_config.match.evpn.vni }}
-{%           endif %}
-{%           if rule_config.match.interface is vyos_defined %}
- match interface {{ rule_config.match.interface }}
-{%           endif %}
-{%           if rule_config.match.ip.address.access_list is vyos_defined %}
- match ip address {{ rule_config.match.ip.address.access_list }}
-{%           endif %}
-{%           if rule_config.match.ip.address.prefix_list is vyos_defined %}
- match ip address prefix-list {{ rule_config.match.ip.address.prefix_list }}
-{%           endif %}
-{%           if rule_config.match.ip.nexthop.access_list is vyos_defined %}
- match ip next-hop {{ rule_config.match.ip.nexthop.access_list }}
-{%           endif %}
-{%           if rule_config.match.ip.nexthop.prefix_list is vyos_defined %}
- match ip next-hop prefix-list {{ rule_config.match.ip.nexthop.prefix_list }}
-{%           endif %}
-{%           if rule_config.match.ip.route_source.access_list is vyos_defined %}
- match ip route-source {{ rule_config.match.ip.route_source.access_list }}
-{%           endif %}
-{%           if rule_config.match.ip.route_source.prefix_list is vyos_defined %}
- match ip route-source prefix-list {{ rule_config.match.ip.route_source.prefix_list }}
-{%           endif %}
-{%           if rule_config.match.ipv6.address.access_list is vyos_defined %}
- match ipv6 address {{ rule_config.match.ipv6.address.access_list }}
-{%           endif %}
-{%           if rule_config.match.ipv6.address.prefix_list is vyos_defined %}
- match ipv6 address prefix-list {{ rule_config.match.ipv6.address.prefix_list }}
-{%           endif %}
-{%           if rule_config.match.ipv6.nexthop is vyos_defined %}
- match ipv6 next-hop address {{ rule_config.match.ipv6.nexthop }}
-{%           endif %}
-{%           if rule_config.match.large_community.large_community_list is vyos_defined %}
- match large-community {{ rule_config.match.large_community.large_community_list }}
-{%           endif %}
-{%           if rule_config.match.local_preference is vyos_defined %}
- match local-preference {{ rule_config.match.local_preference }}
-{%           endif %}
-{%           if rule_config.match.metric is vyos_defined %}
- match metric {{ rule_config.match.metric }}
-{%           endif %}
-{%           if rule_config.match.origin is vyos_defined %}
- match origin {{ rule_config.match.origin }}
-{%           endif %}
-{%           if rule_config.match.peer is vyos_defined %}
- match peer {{ rule_config.match.peer }}
-{%           endif %}
-{%           if rule_config.match.rpki is vyos_defined %}
- match rpki {{ rule_config.match.rpki }}
-{%           endif %}
-{%           if rule_config.match.tag is vyos_defined %}
- match tag {{ rule_config.match.tag }}
-{%           endif %}
-{%         endif %}
-{%         if rule_config.on_match.next is vyos_defined %}
- on-match next
-{%         endif %}
-{%         if rule_config.on_match.goto is vyos_defined %}
- on-match goto {{ rule_config.on_match.goto }}
-{%         endif %}
-{%         if rule_config.set is vyos_defined %}
-{%           if rule_config.set.aggregator.as is vyos_defined and rule_config.set.aggregator.ip is vyos_defined %}
- set aggregator as {{ rule_config.set.aggregator.as }} {{ rule_config.set.aggregator.ip }}
-{%           endif %}
-{%           if rule_config.set.as_path_exclude is vyos_defined %}
- set as-path exclude {{ rule_config.set.as_path_exclude }}
-{%           endif %}
-{%           if rule_config.set.as_path_prepend is vyos_defined %}
- set as-path prepend {{ rule_config.set.as_path_prepend }}
-{%           endif %}
-{%           if rule_config.set.atomic_aggregate is vyos_defined %}
- set atomic-aggregate
-{%           endif %}
-{%           if rule_config.set.comm_list.comm_list is vyos_defined %}
- set comm-list {{ rule_config.set.comm_list.comm_list }} {{ 'delete' if rule_config.set.comm_list.delete is vyos_defined }}
-{%           endif %}
-{%           if rule_config.set.community is vyos_defined %}
- set community {{ rule_config.set.community }}
-{%           endif %}
-{%           if rule_config.set.distance is vyos_defined %}
- set distance {{ rule_config.set.distance }}
-{%           endif %}
-{%           if rule_config.set.extcommunity.bandwidth is vyos_defined %}
- set extcommunity bandwidth {{ rule_config.set.extcommunity.bandwidth }}
-{%           endif %}
-{%           if rule_config.set.extcommunity.rt is vyos_defined %}
- set extcommunity rt {{ rule_config.set.extcommunity.rt }}
-{%           endif %}
-{%           if rule_config.set.extcommunity.soo is vyos_defined %}
- set extcommunity soo {{ rule_config.set.extcommunity.soo }}
-{%           endif %}
-{%           if rule_config.set.ip_next_hop is vyos_defined %}
- set ip next-hop {{ rule_config.set.ip_next_hop }}
-{%           endif %}
-{%           if rule_config.set.ipv6_next_hop.global is vyos_defined %}
- set ipv6 next-hop global {{ rule_config.set.ipv6_next_hop.global }}
-{%           endif %}
-{%           if rule_config.set.ipv6_next_hop.local is vyos_defined %}
- set ipv6 next-hop local {{ rule_config.set.ipv6_next_hop.local }}
-{%           endif %}
-{%           if rule_config.set.ipv6_next_hop.peer_address is vyos_defined %}
- set ipv6 next-hop peer-address
-{%           endif %}
-{%           if rule_config.set.ipv6_next_hop.prefer_global is vyos_defined %}
- set ipv6 next-hop prefer-global
-{%           endif %}
-{%           if rule_config.set.large_community is vyos_defined %}
- set large-community {{ rule_config.set.large_community }}
-{%           endif %}
-{%           if rule_config.set.large_comm_list_delete is vyos_defined %}
- set large-comm-list {{ rule_config.set.large_comm_list_delete }} delete
-{%           endif %}
-{%           if rule_config.set.local_preference is vyos_defined %}
- set local-preference {{ rule_config.set.local_preference }}
-{%           endif %}
-{%           if rule_config.set.metric is vyos_defined %}
- set metric {{ rule_config.set.metric }}
-{%           endif %}
-{%           if rule_config.set.metric_type is vyos_defined %}
- set metric-type {{ rule_config.set.metric_type }}
-{%           endif %}
-{%           if rule_config.set.origin is vyos_defined %}
- set origin {{ rule_config.set.origin }}
-{%           endif %}
-{%           if rule_config.set.originator_id is vyos_defined %}
- set originator-id {{ rule_config.set.originator_id }}
-{%           endif %}
-{%           if rule_config.set.src is vyos_defined %}
- set src {{ rule_config.set.src }}
-{%           endif %}
-{%           if rule_config.set.table is vyos_defined %}
- set table {{ rule_config.set.table }}
-{%           endif %}
-{%           if rule_config.set.tag is vyos_defined %}
- set tag {{ rule_config.set.tag }}
-{%           endif %}
-{%           if rule_config.set.weight is vyos_defined %}
- set weight {{ rule_config.set.weight }}
-{%           endif %}
-{%         endif %}
-exit
-!
-{%       endfor %}
-{%     endif %}
-{%   endfor %}
-{% endif %}
diff --git a/data/templates/frr/ripd.frr.j2 b/data/templates/frr/ripd.frr.j2
new file mode 100644
index 000000000..df35150ca
--- /dev/null
+++ b/data/templates/frr/ripd.frr.j2
@@ -0,0 +1,92 @@
+{# RIP key-chain definition #}
+{% if interface is vyos_defined %}
+{%     for iface, iface_config in interface.items() %}
+{%         if iface_config.authentication.md5 is vyos_defined %}
+key chain {{ iface }}-rip
+{%             for key_id, key_options in iface_config.authentication.md5.items() %}
+ key {{ key_id }}
+{%                 if key_options.password is vyos_defined %}
+  key-string {{ key_options.password }}
+{%                 endif %}
+ exit
+{%             endfor %}
+exit
+{%         endif %}
+{%     endfor %}
+{% endif %}
+!
+{# Interface specific configuration #}
+{% if interface is vyos_defined %}
+{%     for iface, iface_config in interface.items() %}
+interface {{ iface }}
+{%         if iface_config.authentication.plaintext_password is vyos_defined %}
+ ip rip authentication mode text
+ ip rip authentication string {{ iface_config.authentication.plaintext_password }}
+{%         elif iface_config.authentication.md5 is vyos_defined %}
+ ip rip authentication key-chain {{ iface }}-rip
+ ip rip authentication mode md5
+{%         endif %}
+{%         if iface_config.split_horizon.disable is vyos_defined %}
+ no ip rip split-horizon
+{%         endif %}
+{%         if iface_config.split_horizon.poison_reverse is vyos_defined %}
+ ip rip split-horizon poisoned-reverse
+{%         endif %}
+exit
+!
+{%     endfor %}
+{% endif %}
+!
+router rip
+{% if default_distance is vyos_defined %}
+ distance {{ default_distance }}
+{% endif %}
+{% if network_distance is vyos_defined %}
+{%     for network, network_config in network_distance.items() %}
+{%         if network_config.distance is vyos_defined %}
+ distance {{ network_config.distance }} {{ network }}
+{%         endif %}
+{%     endfor %}
+{% endif %}
+{% if neighbor is vyos_defined %}
+{%     for address in neighbor %}
+ neighbor {{ address }}
+{%     endfor %}
+{% endif %}
+{% if distribute_list is vyos_defined %}
+{%     if distribute_list.access_list.in is vyos_defined %}
+ distribute-list {{ distribute_list.access_list.in }} in
+{%     endif %}
+{%     if distribute_list.access_list.out is vyos_defined %}
+ distribute-list {{ distribute_list.access_list.out }} out
+{%     endif %}
+{%     if distribute_list.interface is vyos_defined %}
+{%         for interface, interface_config in distribute_list.interface.items() %}
+{%             if interface_config.access_list.in is vyos_defined %}
+ distribute-list {{ interface_config.access_list.in }} in {{ interface }}
+{%             endif %}
+{%             if interface_config.access_list.out is vyos_defined %}
+ distribute-list {{ interface_config.access_list.out }} out {{ interface }}
+{%             endif %}
+{%             if interface_config.prefix_list.in is vyos_defined %}
+ distribute-list prefix {{ interface_config.prefix_list.in }} in {{ interface }}
+{%             endif %}
+{%             if interface_config.prefix_list.out is vyos_defined %}
+ distribute-list prefix {{ interface_config.prefix_list.out }} out {{ interface }}
+{%             endif %}
+{%         endfor %}
+{%     endif %}
+{%     if distribute_list.prefix_list.in is vyos_defined %}
+ distribute-list prefix {{ distribute_list.prefix_list.in }} in
+{%     endif %}
+{%     if distribute_list.prefix_list.out is vyos_defined %}
+ distribute-list prefix {{ distribute_list.prefix_list.out }} out
+{%     endif %}
+{% endif %}
+{% include 'frr/rip_ripng.frr.j2' %}
+exit
+!
+{% if route_map is vyos_defined %}
+ip protocol rip route-map {{ route_map }}
+{% endif %}
+!
diff --git a/data/templates/frr/ripd.frr.tmpl b/data/templates/frr/ripd.frr.tmpl
deleted file mode 100644
index 2dbb93052..000000000
--- a/data/templates/frr/ripd.frr.tmpl
+++ /dev/null
@@ -1,92 +0,0 @@
-{# RIP key-chain definition #}
-{% if interface is vyos_defined %}
-{%   for iface, iface_config in interface.items() %}
-{%     if iface_config.authentication.md5 is vyos_defined %}
-key chain {{ iface }}-rip
-{%       for key_id, key_options in iface_config.authentication.md5.items() %}
- key {{ key_id }}
-{%         if key_options.password is vyos_defined %}
-  key-string {{ key_options.password }}
-{%         endif %}
- exit
-{%       endfor %}
-exit
-{%     endif %}
-{%   endfor %}
-{% endif %}
-!
-{# Interface specific configuration #}
-{% if interface is vyos_defined %}
-{%   for iface, iface_config in interface.items() %}
-interface {{ iface }}
-{%     if iface_config.authentication.plaintext_password is vyos_defined %}
- ip rip authentication mode text
- ip rip authentication string {{ iface_config.authentication.plaintext_password }}
-{%     elif iface_config.authentication.md5 is vyos_defined %}
- ip rip authentication key-chain {{ iface }}-rip
- ip rip authentication mode md5
-{%     endif %}
-{%     if iface_config.split_horizon.disable is vyos_defined %}
- no ip rip split-horizon
-{%     endif %}
-{%     if iface_config.split_horizon.poison_reverse is vyos_defined %}
- ip rip split-horizon poisoned-reverse
-{%     endif %}
-exit
-!
-{%   endfor %}
-{% endif %}
-!
-router rip
-{% if default_distance is vyos_defined %}
- distance {{ default_distance }}
-{% endif %}
-{% if network_distance is vyos_defined %}
-{%   for network, network_config in network_distance.items() %}
-{%     if network_config.distance is vyos_defined %}
- distance {{ network_config.distance }} {{ network }}
-{%     endif %}
-{%   endfor %}
-{% endif %}
-{% if neighbor is vyos_defined %}
-{%   for address in neighbor %}
- neighbor {{ address }}
-{%   endfor %}
-{% endif %}
-{% if distribute_list is vyos_defined %}
-{%   if distribute_list.access_list.in is vyos_defined %}
- distribute-list {{ distribute_list.access_list.in }} in
-{%   endif %}
-{%   if distribute_list.access_list.out is vyos_defined %}
- distribute-list {{ distribute_list.access_list.out }} out
-{%   endif %}
-{%   if distribute_list.interface is vyos_defined %}
-{%     for interface, interface_config in distribute_list.interface.items() %}
-{%       if interface_config.access_list.in is vyos_defined %}
- distribute-list {{ interface_config.access_list.in }} in {{ interface }}
-{%       endif %}
-{%       if interface_config.access_list.out is vyos_defined %}
- distribute-list {{ interface_config.access_list.out }} out {{ interface }}
-{%       endif %}
-{%       if interface_config.prefix_list.in is vyos_defined %}
- distribute-list prefix {{ interface_config.prefix_list.in }} in {{ interface }}
-{%       endif %}
-{%       if interface_config.prefix_list.out is vyos_defined %}
- distribute-list prefix {{ interface_config.prefix_list.out }} out {{ interface }}
-{%       endif %}
-{%     endfor %}
-{%   endif %}
-{%   if distribute_list.prefix_list.in is vyos_defined %}
- distribute-list prefix {{ distribute_list.prefix_list.in }} in
-{%   endif %}
-{%   if distribute_list.prefix_list.out is vyos_defined %}
- distribute-list prefix {{ distribute_list.prefix_list.out }} out
-{%   endif %}
-{% endif %}
-{% include 'frr/rip_ripng.frr.j2' %}
-exit
-!
-{% if route_map is vyos_defined %}
-ip protocol rip route-map {{ route_map }}
-{% endif %}
-!
diff --git a/data/templates/frr/ripngd.frr.tmpl b/data/templates/frr/ripngd.frr.j2
index 06c61dd48..7919b1bad 100644
--- a/data/templates/frr/ripngd.frr.tmpl
+++ b/data/templates/frr/ripngd.frr.j2
@@ -1,52 +1,52 @@
 {# Interface specific configuration #}
 {% if interface is vyos_defined %}
-{%   for iface, iface_config in interface.items() %}
+{%     for iface, iface_config in interface.items() %}
 interface {{ iface }}
-{%     if iface_config.split_horizon.disable is vyos_defined %}
+{%         if iface_config.split_horizon.disable is vyos_defined %}
  no ipv6 rip split-horizon
-{%     endif %}
-{%     if iface_config.split_horizon.poison_reverse is vyos_defined %}
+{%         endif %}
+{%         if iface_config.split_horizon.poison_reverse is vyos_defined %}
  ipv6 rip split-horizon poisoned-reverse
-{%     endif %}
+{%         endif %}
 exit
-{%   endfor %}
+{%     endfor %}
 {% endif %}
 !
 router ripng
 {% if aggregate_address is vyos_defined %}
-{%   for prefix in aggregate_address %}
+{%     for prefix in aggregate_address %}
  aggregate-address {{ prefix }}
-{%   endfor %}
+{%     endfor %}
 {% endif %}
 {% if distribute_list is vyos_defined %}
-{%   if distribute_list.access_list.in is vyos_defined %}
+{%     if distribute_list.access_list.in is vyos_defined %}
  ipv6 distribute-list {{ distribute_list.access_list.in }} in
-{%   endif %}
-{%   if distribute_list.access_list.out is vyos_defined %}
+{%     endif %}
+{%     if distribute_list.access_list.out is vyos_defined %}
  ipv6 distribute-list {{ distribute_list.access_list.out }} out
-{%   endif %}
-{%   if distribute_list.interface is vyos_defined %}
-{%     for interface, interface_config in distribute_list.interface.items() %}
-{%       if interface_config.access_list.in is vyos_defined %}
+{%     endif %}
+{%     if distribute_list.interface is vyos_defined %}
+{%         for interface, interface_config in distribute_list.interface.items() %}
+{%             if interface_config.access_list.in is vyos_defined %}
  ipv6 distribute-list {{ interface_config.access_list.in }} in {{ interface }}
-{%       endif %}
-{%       if interface_config.access_list.out is vyos_defined %}
+{%             endif %}
+{%             if interface_config.access_list.out is vyos_defined %}
  ipv6 distribute-list {{ interface_config.access_list.out }} out {{ interface }}
-{%       endif %}
-{%       if interface_config.prefix_list.in is vyos_defined %}
+{%             endif %}
+{%             if interface_config.prefix_list.in is vyos_defined %}
  ipv6 distribute-list prefix {{ interface_config.prefix_list.in }} in {{ interface }}
-{%       endif %}
-{%       if interface_config.prefix_list.out is vyos_defined %}
+{%             endif %}
+{%             if interface_config.prefix_list.out is vyos_defined %}
  ipv6 distribute-list prefix {{ interface_config.prefix_list.out }} out {{ interface }}
-{%       endif %}
-{%     endfor %}
-{%   endif %}
-{%   if distribute_list.prefix_list.in is vyos_defined %}
+{%             endif %}
+{%         endfor %}
+{%     endif %}
+{%     if distribute_list.prefix_list.in is vyos_defined %}
  ipv6 distribute-list prefix {{ distribute_list.prefix_list.in }} in
-{%   endif %}
-{%   if distribute_list.prefix_list.out is vyos_defined %}
+{%     endif %}
+{%     if distribute_list.prefix_list.out is vyos_defined %}
  ipv6 distribute-list prefix {{ distribute_list.prefix_list.out }} out
-{%   endif %}
+{%     endif %}
 {% endif %}
 {% include 'frr/rip_ripng.frr.j2' %}
 exit
diff --git a/data/templates/frr/static_mcast.frr.tmpl b/data/templates/frr/static_mcast.frr.j2
index 4f114109a..491d4b54a 100644
--- a/data/templates/frr/static_mcast.frr.tmpl
+++ b/data/templates/frr/static_mcast.frr.j2
@@ -1,20 +1,20 @@
 !
 {% for route_gr in old_mroute %}
-{%   for nh in old_mroute[route_gr] %}
-{%     if old_mroute[route_gr][nh] %}
+{%     for nh in old_mroute[route_gr] %}
+{%         if old_mroute[route_gr][nh] %}
 no ip mroute {{ route_gr }} {{ nh }} {{ old_mroute[route_gr][nh] }}
-{%     else %}
+{%         else %}
 no ip mroute {{ route_gr }} {{ nh }}
-{%     endif %}
-{%   endfor %}
+{%         endif %}
+{%     endfor %}
 {% endfor %}
 {% for route_gr in mroute %}
-{%   for nh in mroute[route_gr] %}
-{%     if mroute[route_gr][nh] %}
+{%     for nh in mroute[route_gr] %}
+{%         if mroute[route_gr][nh] %}
 ip mroute {{ route_gr }} {{ nh }} {{ mroute[route_gr][nh] }}
-{%     else %}
+{%         else %}
 ip mroute {{ route_gr }} {{ nh }}
-{%     endif %}
-{%   endfor %}
+{%         endif %}
+{%     endfor %}
 {% endfor %}
 !
diff --git a/data/templates/frr/staticd.frr.j2 b/data/templates/frr/staticd.frr.j2
new file mode 100644
index 000000000..08b2a3dab
--- /dev/null
+++ b/data/templates/frr/staticd.frr.j2
@@ -0,0 +1,58 @@
+{% from 'frr/static_routes_macro.j2' import static_routes %}
+!
+{% set ip_prefix = 'ip' %}
+{% set ipv6_prefix = 'ipv6' %}
+{% if vrf is vyos_defined %}
+{#     We need to add an additional whitespace in front of the prefix #}
+{#     when VRFs are in use, thus we use a variable for prefix handling #}
+{%     set ip_prefix = ' ip' %}
+{%     set ipv6_prefix = ' ipv6' %}
+vrf {{ vrf }}
+{% endif %}
+{# IPv4 routing #}
+{% if route is vyos_defined %}
+{%     for prefix, prefix_config in route.items() %}
+{{ static_routes(ip_prefix, prefix, prefix_config) }}
+{%     endfor %}
+{% endif %}
+{# IPv4 default routes from DHCP interfaces #}
+{% if dhcp is vyos_defined %}
+{%     for interface, interface_config in dhcp.items() %}
+{%         set next_hop = interface | get_dhcp_router %}
+{%         if next_hop is vyos_defined %}
+{{ ip_prefix }} route 0.0.0.0/0 {{ next_hop }} {{ interface }} tag 210 {{ interface_config.distance }}
+{%         endif %}
+{%     endfor %}
+{% endif %}
+{# IPv6 routing #}
+{% if route6 is vyos_defined %}
+{%     for prefix, prefix_config in route6.items() %}
+{{ static_routes(ipv6_prefix, prefix, prefix_config) }}
+{%     endfor %}
+{% endif %}
+{% if vrf is vyos_defined %}
+ exit-vrf
+{% endif %}
+!
+{# Policy route tables #}
+{% if table is vyos_defined %}
+{%     for table_id, table_config in table.items() %}
+{%         if table_config.route is vyos_defined %}
+{%             for prefix, prefix_config in table_config.route.items() %}
+{{ static_routes('ip', prefix, prefix_config, table_id) }}
+{%             endfor %}
+{%         endif %}
+!
+{%         if table_config.route6 is vyos_defined %}
+{%             for prefix, prefix_config in table_config.route6.items() %}
+{{ static_routes('ipv6', prefix, prefix_config, table_id) }}
+{%             endfor %}
+{%         endif %}
+!
+{%     endfor %}
+{% endif %}
+!
+{% if route_map is vyos_defined %}
+ip protocol static route-map {{ route_map }}
+!
+{% endif %}
diff --git a/data/templates/frr/staticd.frr.tmpl b/data/templates/frr/staticd.frr.tmpl
deleted file mode 100644
index c7138b12b..000000000
--- a/data/templates/frr/staticd.frr.tmpl
+++ /dev/null
@@ -1,58 +0,0 @@
-{% from 'frr/static_routes_macro.j2' import static_routes %}
-!
-{% set ip_prefix = 'ip' %}
-{% set ipv6_prefix = 'ipv6' %}
-{% if vrf is vyos_defined %}
-{#   We need to add an additional whitespace in front of the prefix #}
-{#   when VRFs are in use, thus we use a variable for prefix handling #}
-{%   set ip_prefix = ' ip' %}
-{%   set ipv6_prefix = ' ipv6' %}
-vrf {{ vrf }}
-{% endif %}
-{# IPv4 routing #}
-{% if route is vyos_defined %}
-{%   for prefix, prefix_config in route.items() %}
-{{ static_routes(ip_prefix, prefix, prefix_config) }}
-{%-   endfor -%}
-{% endif %}
-{# IPv4 default routes from DHCP interfaces #}
-{% if dhcp is vyos_defined %}
-{%   for interface, interface_config in dhcp.items() %}
-{%     set next_hop = interface | get_dhcp_router %}
-{%     if next_hop is vyos_defined %}
-{{ ip_prefix }} route 0.0.0.0/0 {{ next_hop }} {{ interface }} tag 210 {{ interface_config.distance }}
-{%     endif %}
-{%   endfor %}
-{% endif %}
-{# IPv6 routing #}
-{% if route6 is vyos_defined %}
-{%   for prefix, prefix_config in route6.items() %}
-{{ static_routes(ipv6_prefix, prefix, prefix_config) }}
-{%-   endfor -%}
-{% endif %}
-{% if vrf is vyos_defined %}
- exit-vrf
-{% endif %}
-!
-{# Policy route tables #}
-{% if table is vyos_defined %}
-{%   for table_id, table_config in table.items() %}
-{%     if table_config.route is vyos_defined %}
-{%       for prefix, prefix_config in table_config.route.items() %}
-{{ static_routes('ip', prefix, prefix_config, table_id) }}
-{%-       endfor -%}
-{%     endif %}
-!
-{%     if table_config.route6 is vyos_defined %}
-{%       for prefix, prefix_config in table_config.route6.items() %}
-{{ static_routes('ipv6', prefix, prefix_config, table_id) }}
-{%-       endfor -%}
-{%     endif %}
-!
-{%   endfor %}
-{% endif %}
-!
-{% if route_map is vyos_defined %}
-ip protocol static route-map {{ route_map }}
-!
-{% endif %}
diff --git a/data/templates/frr/vrf-vni.frr.j2 b/data/templates/frr/vrf-vni.frr.j2
new file mode 100644
index 000000000..e5f4810a1
--- /dev/null
+++ b/data/templates/frr/vrf-vni.frr.j2
@@ -0,0 +1,9 @@
+{% if name is vyos_defined %}
+{%     for vrf, vrf_config in name.items() %}
+vrf {{ vrf }}
+{%         if vrf_config.vni is vyos_defined %}
+ vni {{ vrf_config.vni }}
+{%         endif %}
+ exit-vrf
+{%     endfor %}
+{% endif %}
diff --git a/data/templates/frr/vrf-vni.frr.tmpl b/data/templates/frr/vrf-vni.frr.tmpl
deleted file mode 100644
index 916b5d05d..000000000
--- a/data/templates/frr/vrf-vni.frr.tmpl
+++ /dev/null
@@ -1,9 +0,0 @@
-{% if name is vyos_defined %}
-{%   for vrf, vrf_config in name.items() %}
-vrf {{ vrf }}
-{%     if vrf_config.vni is vyos_defined %}
- vni {{ vrf_config.vni }}
-{%     endif %}
- exit-vrf
-{%   endfor %}
-{% endif %}
diff --git a/data/templates/frr/vrf.route-map.frr.tmpl b/data/templates/frr/vrf.route-map.frr.j2
index 5e0c56a7b..5e0c56a7b 100644
--- a/data/templates/frr/vrf.route-map.frr.tmpl
+++ b/data/templates/frr/vrf.route-map.frr.j2