diff --git a/src/device/service/drivers/openconfig/templates/interface/subinterface/edit_config.xml b/src/device/service/drivers/openconfig/templates/interface/subinterface/edit_config.xml
index 9cff1afd3375c34f8f9d2c3e8447b7b1172b40e5..eb7f49d76b9bb369cca67d57dd5638148a74cdf3 100644
--- a/src/device/service/drivers/openconfig/templates/interface/subinterface/edit_config.xml
+++ b/src/device/service/drivers/openconfig/templates/interface/subinterface/edit_config.xml
@@ -30,6 +30,22 @@
                     </match>
                 </vlan>
                 {% endif %}
+                {% if address_ip is defined %}
+                <oc-ip:ipv4>
+                    <oc-ip:config>
+                        <oc-ip:mtu>1500</mtu>
+                    </oc-ip:config>
+                    <oc-ip:addresses>
+                        <oc-ip:address>
+                            <oc-ip:ip>{{address_ip}}</oc-ip:ip>
+                            <oc-ip:config>
+                                <oc-ip:ip>{{address_ip}}</oc-ip:ip>
+                                <oc-ip:prefix-length>{{address_prefix}}</oc-ip:prefix-length>
+                            </oc-ip:config>
+                        </oc-ip:address>
+                    </oc-ip:addresses>
+                </oc-ip:ipv4>
+                {% endif %}
             </subinterface>
         </subinterfaces>
         {% endif %}
diff --git a/src/device/service/drivers/openconfig/templates/network_instance/interface/edit_config.xml b/src/device/service/drivers/openconfig/templates/network_instance/interface/edit_config.xml
index 96e13cc37b2783879df762a568be918ff95b2453..e926796d039d54e30f6ba13eb5eb66bcec079c08 100644
--- a/src/device/service/drivers/openconfig/templates/network_instance/interface/edit_config.xml
+++ b/src/device/service/drivers/openconfig/templates/network_instance/interface/edit_config.xml
@@ -3,7 +3,7 @@
         <name>{{name}}</name>
         <config>
             <name>{{name}}</name>
-            <type xmlns:oc-ni-types="http://openconfig.net/yang/network-instance-types">oc-ni-types:L3VRF</type>
+            <type xmlns:oc-ni-types="http://openconfig.net/yang/network-instance-types">oc-ni-types:{{type}}</type>
         </config>
         <interfaces>
             <interface{% if operation is defined %} xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0" nc:operation="{{operation}}"{% endif %}>
@@ -17,33 +17,3 @@
         </interfaces>
     </network-instance>
 </network-instances>
-<interfaces xmlns="http://openconfig.net/yang/interfaces">
-    <interface>
-        <name>{{interface}}</name>
-        <config>
-            <name>{{interface}}</name>
-        </config>
-        <subinterfaces>
-            <subinterface>
-                <index>{{subinterface}}</index>
-                <config>
-                    <index>{{subinterface}}</index>
-                </config>
-                <ipv4 xmlns="http://openconfig.net/yang/interfaces/ip">
-                    <config>
-                        <mtu>1500</mtu>
-                    </config>
-                    <addresses>
-                        <address>
-                            <ip>{{address_ip}}</ip>
-                            <config>
-                                <ip>{{address_ip}}</ip>
-                                <prefix-length>{{address_prefix}}</prefix-length>
-                            </config>
-                        </address>
-                    </addresses>
-                </ipv4>
-            </subinterface>
-        </subinterfaces>
-    </interface>
-</interfaces>