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 20aecb90b5bdb140a2e31d0bad128231804d07d1..2d8d3ee07b3a8df20a4b51be755e18b7aec982de 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
@@ -1,5 +1,4 @@
-<interfaces xmlns="http://openconfig.net/yang/interfaces" 
-            xmlns:oc-ip="http://openconfig.net/yang/interfaces/ip" >
+<interfaces xmlns="http://openconfig.net/yang/interfaces">
     <interface{% if operation is defined %} xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0" nc:operation="{{operation}}"{% endif %}>
         <name>{{name}}</name>
         {% if operation is defined and operation != 'delete' %}
@@ -31,20 +30,20 @@
                 </vlan>
                 {% endif %}
                 {% if address_ip is defined %}
-                <oc-ip:ipv4>
-                    <oc-ip:config>
+                <ipv4 xmlns="http://openconfig.net/yang/interfaces/ip">
+                    <config>
                         {% if mtu is defined %}<mtu>{{mtu}}</mtu>{% endif%}
-                    </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>
+                    </config>
+                    <addresses>
+                        <address>
+                            <ip>{{address_ip}}</ip>
+                            <config>
+                                <ip>{{address_ip}}</ip>
+                                <prefix-length>{{address_prefix}}</prefix-length>
+                            </config>
+                        </address>
+                    </addresses>
+                </ipv4>
                 {% endif %}
             </subinterface>
         </subinterfaces>