diff --git a/src/device/service/drivers/openconfig/templates/acl/acl-set/acl-entry/edit_config.xml b/src/device/service/drivers/openconfig/templates/acl/acl-set/acl-entry/edit_config.xml
index fac259b6fdcd3cbded93088ddc6335ea2bfe5f69..297563cca598b69ab47be3a93cb9b86033a889a9 100644
--- a/src/device/service/drivers/openconfig/templates/acl/acl-set/acl-entry/edit_config.xml
+++ b/src/device/service/drivers/openconfig/templates/acl/acl-set/acl-entry/edit_config.xml
@@ -13,6 +13,7 @@
           <config>
             <sequence-id>{{sequence_id}}</sequence-id>
           </config>
+           {% if config is defined %}
           <ipv4>
             <config>
               {% if source_address is defined %}<source-address>{{source_address}}</source-address>{% endif%}
@@ -35,6 +36,7 @@
               {% if log_action is defined %}<log-action>{{log_action}}</log-action>{% endif%}
             </config>
           </actions>
+          {% endif%}
         </acl-entry>
       </acl-entries>
     </acl-set>
diff --git a/src/device/service/drivers/openconfig/templates/acl/interfaces/egress/edit_config.xml b/src/device/service/drivers/openconfig/templates/acl/interfaces/egress/edit_config.xml
index d987b0cc4b40298533f140f71af83c6fad884020..b070b305a505890c51f3751d2b83eb415ae4aa43 100644
--- a/src/device/service/drivers/openconfig/templates/acl/interfaces/egress/edit_config.xml
+++ b/src/device/service/drivers/openconfig/templates/acl/interfaces/egress/edit_config.xml
@@ -1,18 +1,21 @@
 <acl xmlns="http://openconfig.net/yang/acl">
   <interfaces>
-    <interface{% if operation is defined %} xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0" nc:operation="{{operation}}"{% endif %}>
+    <interface {% if operation is defined %}{% if all is defined %} xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0" nc:operation="{{operation}}"{% endif %} {% endif %}>
       <id>{{id}}</id>
       <config>
         <id>{{id}}</id>
       </config>
+      {% if interface is defined %}
       <interface-ref>
         <config>
           <interface>{{interface}}</interface>
           {% if subinterface is defined %}<subinterface>{{subinterface}}</subinterface>{% endif%}
         </config>
       </interface-ref>
+      {% endif%}
+      {% if set_name_egress is defined %}
       <egress-acl-sets>
-        <egress-acl-set>
+        <egress-acl-set {% if operation is defined %}{% if egress is defined %} xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0" nc:operation="{{operation}}"{% endif %} {% endif %}>>
           <set-name>{{set_name_egress}}</set-name>
           <type>{{type_egress}}</type>
           <config>
@@ -21,6 +24,7 @@
           </config>
         </egress-acl-set>
       </egress-acl-sets>
+      {% endif%}
     </interface>
   </interfaces>
 </acl>
diff --git a/src/device/service/drivers/openconfig/templates/acl/interfaces/ingress/edit_config.xml b/src/device/service/drivers/openconfig/templates/acl/interfaces/ingress/edit_config.xml
index 144a03c55477e532379541be5443063fe3aa2f10..d1f18efb26bc1316354c2bb26623cb36f7dc0be6 100644
--- a/src/device/service/drivers/openconfig/templates/acl/interfaces/ingress/edit_config.xml
+++ b/src/device/service/drivers/openconfig/templates/acl/interfaces/ingress/edit_config.xml
@@ -1,18 +1,21 @@
 <acl xmlns="http://openconfig.net/yang/acl">
   <interfaces>
-    <interface{% if operation is defined %} xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0" nc:operation="{{operation}}"{% endif %}>
+    <interface {% if operation is defined %}{% if all is defined %} xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0" nc:operation="{{operation}}"{% endif %} {% endif %}>
       <id>{{id}}</id>
       <config>
         <id>{{id}}</id>
       </config>
+      {% if interface is defined %}
       <interface-ref>
         <config>
           <interface>{{interface}}</interface>
           {% if subinterface is defined %}<subinterface>{{subinterface}}</subinterface>{% endif%}
         </config>
       </interface-ref>
+      {% endif%}
+      {% if set_name_ingress is defined %}
       <ingress-acl-sets>
-        <ingress-acl-set>
+        <ingress-acl-set {% if operation is defined %}{% if ingress is defined %} xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0" nc:operation="{{operation}}"{% endif %} {% endif %}>
           <set-name>{{set_name_ingress}}</set-name>
           <type>{{type_ingress}}</type>
           <config>
@@ -21,6 +24,7 @@
           </config>
         </ingress-acl-set>
       </ingress-acl-sets>
+      {% endif%}
     </interface>
   </interfaces>
 </acl>