diff --git a/src/device/service/drivers/openconfig/templates/VPN/Network_instance_multivendor.py b/src/device/service/drivers/openconfig/templates/VPN/Network_instance_multivendor.py
index 71581640eaf92fbd77582f652222999d7177ce81..761312c475973e9ef3034258dd8f5885b8e91bca 100644
--- a/src/device/service/drivers/openconfig/templates/VPN/Network_instance_multivendor.py
+++ b/src/device/service/drivers/openconfig/templates/VPN/Network_instance_multivendor.py
@@ -134,6 +134,12 @@ def add_protocol_NI(parameters,vendor, DEL):
                                         with tag('as')       :text(parameters['as'])
                                         if "router_id" in parameters: 
                                             with tag('router-id'):text(parameters['router_id'])
+                                    with tag('afi-safis'):
+                                        with tag('afi-safi', 'xmlns:oc-bgp-types="http://openconfig.net/yang/bgp-types"'):
+                                            with tag('afi-safi-name'): text('oc-bgp-types:IPV4_UNICAST')
+                                            with tag('config'):
+                                                with tag('afi-safi-name'): text('oc-bgp-types:IPV4_UNICAST')
+                                                with tag('enabled'): text('true')
                                 if 'neighbors' in parameters:
                                     with tag('neighbors'):
                                         for neighbor in parameters['neighbors']:
diff --git a/src/device/service/drivers/openconfig/templates/network_instance/protocols/edit_config.xml b/src/device/service/drivers/openconfig/templates/network_instance/protocols/edit_config.xml
index da66d97f053f509a1a595cdb1abc0bd1791ad0bc..7c36dfb45efcd7de456d2d8ee770dd3dd7bf2126 100644
--- a/src/device/service/drivers/openconfig/templates/network_instance/protocols/edit_config.xml
+++ b/src/device/service/drivers/openconfig/templates/network_instance/protocols/edit_config.xml
@@ -19,6 +19,15 @@
                             <as>{{as}}</as>
                             <router-id>{{router_id}}</router-id>
                         </config>
+                        <afi-safis>
+                            <afi-safi xmlns:oc-bgp-types="http://openconfig.net/yang/bgp-types">
+                                <afi-safi-name>oc-bgp-types:IPV4_UNICAST</afi-safi-name>
+                                <config>
+                                    <afi-safi-name>oc-bgp-types:IPV4_UNICAST</afi-safi-name>
+                                    <enabled>true</enabled>
+                                </config>
+                            </afi-safi>
+                        </afi-safis>
                     </global>
                     {% if neighbors is defined %}
                     <neighbors>