diff --git a/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/router/bgp_neighbor.j2 b/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/router/bgp_neighbor.j2
index 12bf86f8dacf9a58ce21291381ee6b0c2faaf8fe..debe66131f3f5fdc2f40a9f2ab4331dac6e7124f 100644
--- a/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/router/bgp_neighbor.j2
+++ b/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/router/bgp_neighbor.j2
@@ -3,27 +3,44 @@
                     <ip-address>{{ neighbor.ip }}</ip-address>
                     <description>{{ neighbor.description }}</description>
                     <group>{{ neighbor.group }}</group>
-                    {% if neighbor.families is defined %}
+                  {% if neighbor.auth_key is defined %}
+                    <authentication-key>{{ neighbor.auth_key }</authentication-key>
+                  {% endif %}
+                  {% if neighbor.hold_time is defined %}
+                    <hold-time>
+                      <seconds>{{ neighbor.hold_time }}</seconds>
+                    </hold-time>
+                  {% endif %}
+                  {% if neighbor.families is defined %}
                     <family>
                       {% for family in neighbor.families %}
                         <{{ family }}>true</{{ family }}>
                       {% endfor %}
                     </family>
-                    {% endif %}
-                    {% if neighbor.policies.import is defined %}
+                  {% endif %}
+                  {% if neighbor.policies.import is defined %}
                     <import>
                         {% for imp_pol in neighbor.policies.import %}
                         <policy>{{ imp_pol }}</policy>
                         {% endfor %}
                     </import>
-                    {% endif %}
-                    {% if neighbor.policies.export is defined %}
+                  {% endif %}
+                  {% if neighbor.policies.export is defined %}
                     <export>
                         {% for exp_pol in neighbor.policies.export %}
                         <policy>{{ exp_pol }}</policy>
                         {% endfor %}
                     </export>
-                    {% endif %}
+                  {% endif %}
+                  {% if neighbor.cluster_id is defined %}
+                    <cluster>
+                      {% if neighbor.cluster_id == 'system' %}
+                        <cluster-id>{{ lo_ipv4_address }}</cluster-id>
+                      {% else %}
+                        <cluster-id>{{ neighbor.cluster_id }}</cluster-id>
+                      {% endif %}
+                    </cluster>
+                  {% endif %}
                 </neighbor>
                 {% endfor %}