diff --git a/vyos.conf.j2 b/vyos.conf.j2
index 2af460e..1545874 100644
--- a/vyos.conf.j2
+++ b/vyos.conf.j2
@@ -4,7 +4,7 @@
             {% if salt['pillar.get']('interfaces:'+iface_name+':ip:ospf') %}
             ospf {
                 {% if salt['pillar.get']('interfaces:'+iface_name+':ip:ospf:cost',None) != None %}cost {{ salt['pillar.get']('interfaces:'+iface_name+':ip:ospf:cost') }}{% endif %}
-                {% if salt['pillar.get']('interfaces:'+iface_name+':ip:ospf:passive') %}
+                {% if salt['pillar.get']('interfaces:'+iface_name+':ip:ospf:passive',False) %}
                 {% else %}
                 network {{ salt['pillar.get']('interfaces:'+iface_name+':ip:ospf:network') }}
                 dead-interval {{ salt['pillar.get']('interfaces:'+iface_name+':ip:ospf:dead-interval',40) }}
@@ -22,7 +22,7 @@
             ospfv3 {
                 {% if salt['pillar.get']('interfaces:'+iface_name+':ipv6:ospfv3:cost',None) != None %}cost {{ salt['pillar.get']('interfaces:'+iface_name+':ipv6:ospfv3:cost') }}{% endif %}
                 instance-id {{ salt['pillar.get']('interfaces:'+iface_name+':ipv6:ospfv3:instance-id',0) }}
-                {% if salt['pillar.get']('interfaces:'+iface_name+':ipv6:ospfv3:passive') %}
+                {% if salt['pillar.get']('interfaces:'+iface_name+':ipv6:ospfv3:passive',False) %}
                 passive
                 {% else %}
                 dead-interval {{ salt['pillar.get']('interfaces:'+iface_name+':ipv6:ospfv3:dead-interval',40) }}
@@ -228,6 +228,7 @@ protocols {
     bgp {{ bgp_as }} {
         parameters {
             router-id {{ as_data['parameters']['router-id'] }}
+            default no-ipv4-unicast
         }
         {% if as_data.get('address-family',None) %}
         address-family {