diff --git a/net/frr/src/opnsense/service/templates/OPNsense/Quagga/frr b/net/frr/src/opnsense/service/templates/OPNsense/Quagga/frr
index 87ea4e79c..6721263c4 100644
--- a/net/frr/src/opnsense/service/templates/OPNsense/Quagga/frr
+++ b/net/frr/src/opnsense/service/templates/OPNsense/Quagga/frr
@@ -1,4 +1,3 @@
-defaultrouter="NO"
 frr_enable="{% if helpers.exists('OPNsense.quagga.general.enabled') and OPNsense.quagga.general.enabled == '1' %}YES{% else %}NO{% endif %}"
 
 {% if helpers.exists('OPNsense.quagga.general.enabled') and OPNsense.quagga.general.enabled == '1' %}
@@ -14,5 +13,3 @@ if helpers.exists('OPNsense.quagga.ripng.enabled') and OPNsense.quagga.ripng.ena
 if helpers.exists('OPNsense.quagga.isis.enabled') and OPNsense.quagga.isis.enabled == '1' %} isisd{% endif %}"
 #frr_flags="...."
 #frr_extralibs_path="... ..."
-#router_enable="NO"
-watchfrr_enable="YES"
diff --git a/net/quagga/src/opnsense/service/templates/OPNsense/Quagga/quagga b/net/quagga/src/opnsense/service/templates/OPNsense/Quagga/quagga
index 2e6709c8a..84edaa882 100644
--- a/net/quagga/src/opnsense/service/templates/OPNsense/Quagga/quagga
+++ b/net/quagga/src/opnsense/service/templates/OPNsense/Quagga/quagga
@@ -1,4 +1,3 @@
-defaultrouter="NO"
 quagga_enable="{% if helpers.exists('OPNsense.quagga.general.enabled') and OPNsense.quagga.general.enabled == '1' %}YES{% else %}NO{% endif %}"
 
 {% if helpers.exists('OPNsense.quagga.general.enabled') and OPNsense.quagga.general.enabled == '1' %}
@@ -13,5 +12,3 @@ if helpers.exists('OPNsense.quagga.ospf6.enabled') and OPNsense.quagga.ospf6.ena
 if helpers.exists('OPNsense.quagga.ripng.enabled') and OPNsense.quagga.ripng.enabled == '1' %} ripngd{% endif %}"
 #quagga_flags="...."
 #quagga_extralibs_path="... ..."
-#router_enable="NO"
-watchquagga_enable="YES"