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 8c49a1c738a7a29860c5db5091a1ea32e7ef10ba..ec791f1dfc2603aa343df7fcb34ad7fbb7dcd13f 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,4 +1,7 @@
-   <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">
+              <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>
+                    <update-fault-tolerance>true</update-fault-tolerance>
+                </error-handling>
                 <local-as>
                     <as-number>{{ geant_re_as_number }}</as-number>
                 </local-as>
diff --git a/geant/gap_ansible/roles/base_config/templates/routers/nokia/router/isis.j2 b/geant/gap_ansible/roles/base_config/templates/routers/nokia/router/isis.j2
index bff7c5e1f173f3e0f5709987d809bb80b4cc1c1a..138ddf52b311f81d3172d1f8e2db37b3f638f658 100644
--- a/geant/gap_ansible/roles/base_config/templates/routers/nokia/router/isis.j2
+++ b/geant/gap_ansible/roles/base_config/templates/routers/nokia/router/isis.j2
@@ -4,7 +4,7 @@
 <isis 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">
     <isis-instance>0</isis-instance>
     <admin-state>enable</admin-state>
-    <advertise-router-capability>area</advertise-router-capability>
+    <advertise-router-capability>as</advertise-router-capability>
     <ldp-sync>false</ldp-sync>
     <ipv6-routing>native</ipv6-routing>
     <level-capability>2</level-capability>
diff --git a/geant/gap_ansible/roles/base_config/templates/routers/nokia/router/pim.j2 b/geant/gap_ansible/roles/base_config/templates/routers/nokia/router/pim.j2
index 878662b618436a8a26514325ff20938abddbe742..6a407769594db2a0983828fae5799bb59803f4ff 100644
--- a/geant/gap_ansible/roles/base_config/templates/routers/nokia/router/pim.j2
+++ b/geant/gap_ansible/roles/base_config/templates/routers/nokia/router/pim.j2
@@ -1,4 +1,19 @@
             <pim 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">
+                <rp>
+                    <ipv4>
+                        <bsr-candidate>
+                            <admin-state>disable</admin-state>
+                        </bsr-candidate>
+                    </ipv4>
+                    <ipv6>
+                        <bsr-candidate>
+                            <admin-state>disable</admin-state>
+                        </bsr-candidate>
+                        <embedded-rp>
+                            <admin-state>enable</admin-state>
+                        </embedded-rp>
+                    </ipv6>
+                </rp>
                 <ipv4>
                     <admin-state>enable</admin-state>
                     <rpf-table>rtable-m</rpf-table>