diff --git a/geant/gap_ansible/roles/base_config/templates/routers/nokia/router/bgp.j2 b/geant/gap_ansible/roles/base_config/templates/routers/nokia/router/bgp.j2
index ec791f1dfc2603aa343df7fcb34ad7fbb7dcd13f..379cfe299d4fc9628a25f6e8aa67e036533c8c6f 100644
--- a/geant/gap_ansible/roles/base_config/templates/routers/nokia/router/bgp.j2
+++ b/geant/gap_ansible/roles/base_config/templates/routers/nokia/router/bgp.j2
@@ -1,11 +1,11 @@
-              <bgp xmlns="urn:nokia.com:sros:ns:yang:sr:conf" xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0" xmlns:nokia-attr="urn:nokia.com:sros:ns:yang:sr:attributes" alu:operation="replace">
-                <error-handling>
+              <bgp xmlns="urn:nokia.com:sros:ns:yang:sr:conf" xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0" xmlns:nokia-attr="urn:nokia.com:sros:ns:yang:sr:attributes">
+                <error-handling alu:operation="replace">
                     <update-fault-tolerance>true</update-fault-tolerance>
                 </error-handling>
-                <local-as>
+                <local-as alu:operation="replace">
                     <as-number>{{ geant_re_as_number }}</as-number>
                 </local-as>
-                <group>
+                <group alu:operation="replace">
                     <group-name>iGEANT-P-ONLY</group-name>
                     <admin-state>enable</admin-state>
                     <next-hop-self>true</next-hop-self>
@@ -17,7 +17,7 @@
                         <mcast-ipv4>true</mcast-ipv4>
                     </family>
                 </group>
-                <group>
+                <group alu:operation="replace">
                     <group-name>iGEANT6-P-ONLY</group-name>
                     <authentication-key>aX1kndQNDTAHyJttsnoyKQiLcy8euS8do68= hash2</authentication-key>
                     <next-hop-self>true</next-hop-self>
diff --git a/geant/gap_ansible/roles/base_config/templates/routers/nokia/router/router_base.j2 b/geant/gap_ansible/roles/base_config/templates/routers/nokia/router/router_base.j2
index e7c7334d7886621c99507d2d40ab754585383dcf..e57585182fbc22c98a8ebe2c1b7e4c89e1a5f455 100644
--- a/geant/gap_ansible/roles/base_config/templates/routers/nokia/router/router_base.j2
+++ b/geant/gap_ansible/roles/base_config/templates/routers/nokia/router/router_base.j2
@@ -1,8 +1,8 @@
         <router xmlns="urn:nokia.com:sros:ns:yang:sr:conf" xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0" xmlns:nokia-attr="urn:nokia.com:sros:ns:yang:sr:attributes">
             <router-name>Base</router-name>
-            <autonomous-system xmlns="urn:nokia.com:sros:ns:yang:sr:conf" xmlns:nokia-attr="urn:nokia.com:sros:ns:yang:sr:attributes">20965</autonomous-system>
-            <router-id xmlns="urn:nokia.com:sros:ns:yang:sr:conf" xmlns:nokia-attr="urn:nokia.com:sros:ns:yang:sr:attributes">{{ lo_ipv4_address }}</router-id>
-            <interface xmlns="urn:nokia.com:sros:ns:yang:sr:conf" xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0" xmlns:nokia-attr="urn:nokia.com:sros:ns:yang:sr:attributes">
+            <autonomous-system xmlns="urn:nokia.com:sros:ns:yang:sr:conf" xmlns:nokia-attr="urn:nokia.com:sros:ns:yang:sr:attributes" alu:operation="replace">{{ geant_re_as_number }}<</autonomous-system>
+            <router-id xmlns="urn:nokia.com:sros:ns:yang:sr:conf" xmlns:nokia-attr="urn:nokia.com:sros:ns:yang:sr:attributes" alu:operation="replace">{{ lo_ipv4_address }}</router-id>
+            <interface xmlns="urn:nokia.com:sros:ns:yang:sr:conf" xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0" xmlns:nokia-attr="urn:nokia.com:sros:ns:yang:sr:attributes" alu:operation="replace">
                 <interface-name>system</interface-name>
                 <admin-state>enable</admin-state>
                 {# <mac>02:01:ff:00:00:01</mac> #}
@@ -19,20 +19,20 @@
                     </address>
                 </ipv6>
             </interface>
-            <mpls-labels xmlns="urn:nokia.com:sros:ns:yang:sr:conf" xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0" xmlns:nokia-attr="urn:nokia.com:sros:ns:yang:sr:attributes">
+            <mpls-labels xmlns="urn:nokia.com:sros:ns:yang:sr:conf" xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0" xmlns:nokia-attr="urn:nokia.com:sros:ns:yang:sr:attributes" alu:operation="replace">
                 <static-label-range>9968</static-label-range>
                 <sr-labels>
                     <start>10000</start>
                     <end>19999</end>
                 </sr-labels>
             </mpls-labels>
-            <mpls xmlns="urn:nokia.com:sros:ns:yang:sr:conf" xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0" xmlns:nokia-attr="urn:nokia.com:sros:ns:yang:sr:attributes">
+            <mpls xmlns="urn:nokia.com:sros:ns:yang:sr:conf" xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0" xmlns:nokia-attr="urn:nokia.com:sros:ns:yang:sr:attributes" alu:operation="replace">
                 <admin-state>enable</admin-state>
                 <interface>
                     <interface-name>system</interface-name>
                 </interface>
             </mpls>
-            <rsvp xmlns="urn:nokia.com:sros:ns:yang:sr:conf" xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0" xmlns:nokia-attr="urn:nokia.com:sros:ns:yang:sr:attributes">
+            <rsvp xmlns="urn:nokia.com:sros:ns:yang:sr:conf" xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0" xmlns:nokia-attr="urn:nokia.com:sros:ns:yang:sr:attributes" alu:operation="replace">
                 <admin-state>enable</admin-state>
                 <interface>
                     <interface-name>system</interface-name>