diff --git a/geant/gap_ansible/roles/ibgp_update/templates/juniper/add_p_to_pe.j2 b/geant/gap_ansible/roles/ibgp_update/templates/juniper/add_p_to_pe.j2
index f8ca8a8d6ee98b8d4a2292be11bb7409b59076b9..9308bdc20a52b575a5d941ef97b6812f61828d8b 100644
--- a/geant/gap_ansible/roles/ibgp_update/templates/juniper/add_p_to_pe.j2
+++ b/geant/gap_ansible/roles/ibgp_update/templates/juniper/add_p_to_pe.j2
@@ -1,2 +1,2 @@
-set protocols bgp group iGEANT6-P-ONLY neighbor {{ p_lo_ipv6_address }} description {{ p_router_fqdn }}
-set protocols bgp group iGEANT-P-ONLY neighbor {{ p_lo_ipv4_address }} description {{ p_router_fqdn }}
+set protocols bgp group {{ geant_bgp_groups.p_only.ipv6 }} neighbor {{ p_lo_ipv6_address }} description {{ p_router_fqdn }}
+set protocols bgp group {{ geant_bgp_groups.p_only.ipv4 }} neighbor {{ p_lo_ipv4_address }} description {{ p_router_fqdn }}
diff --git a/geant/gap_ansible/roles/ibgp_update/templates/juniper/remove_p_from_pe.j2 b/geant/gap_ansible/roles/ibgp_update/templates/juniper/remove_p_from_pe.j2
index 0a139d34d9206da6cb197936779ec4f17775cdd0..b40bf1f9f3757fbcce95a205fdf175a9441b4181 100644
--- a/geant/gap_ansible/roles/ibgp_update/templates/juniper/remove_p_from_pe.j2
+++ b/geant/gap_ansible/roles/ibgp_update/templates/juniper/remove_p_from_pe.j2
@@ -1,2 +1,2 @@
-delete protocols bgp group iGEANT6-P-ONLY neighbor {{ p_lo_ipv6_address }}
-delete protocols bgp group iGEANT-P-ONLY neighbor {{ p_lo_ipv4_address }}
+delete protocols bgp group {{ geant_bgp_groups.p_only.ipv6 }} neighbor {{ p_lo_ipv6_address }}
+delete protocols bgp group {{ geant_bgp_groups.p_only.ipv4 }} neighbor {{ p_lo_ipv4_address }}
diff --git a/geant/gap_ansible/roles/ibgp_update/templates/juniper/remove_pe_from_pe.j2 b/geant/gap_ansible/roles/ibgp_update/templates/juniper/remove_pe_from_pe.j2
index 9bd780dd826aa532f672683543211a61c869787e..79f83bd307db75768862dfa287efc0be4c07106f 100644
--- a/geant/gap_ansible/roles/ibgp_update/templates/juniper/remove_pe_from_pe.j2
+++ b/geant/gap_ansible/roles/ibgp_update/templates/juniper/remove_pe_from_pe.j2
@@ -1,2 +1,2 @@
-delete protocols bgp group iGEANT6 neighbor {{ subscription.router.router_lo_ipv6_address }}
-delete protocols bgp group iGEANT neighbor {{ subscription.router.router_lo_ipv4_address }}
+delete protocols bgp group {{ geant_bgp_groups.pe_mesh.ipv6 }} neighbor {{ subscription.router.router_lo_ipv6_address }}
+delete protocols bgp group {{ geant_bgp_groups.pe_mesh.ipv4 }} neighbor {{ subscription.router.router_lo_ipv4_address }}
diff --git a/geant/gap_ansible/roles/ibgp_update/templates/nokia/add_pe_to_p.j2 b/geant/gap_ansible/roles/ibgp_update/templates/nokia/add_pe_to_p.j2
index 198b8878514b5203a7af263af07df1d4e261ac5c..11e210f4e95f9d312e9123a40874c448f221437b 100644
--- a/geant/gap_ansible/roles/ibgp_update/templates/nokia/add_pe_to_p.j2
+++ b/geant/gap_ansible/roles/ibgp_update/templates/nokia/add_pe_to_p.j2
@@ -7,12 +7,12 @@
<neighbor 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">
<ip-address>{{ pe_ipadd.lo4 }}</ip-address>
<description>{{ pe_fqdn }}</description>
- <group>iGEANT-P-ONLY</group>
+ <group>{{ geant_bgp_groups.p_only.ipv4 }}</group>
</neighbor>
<neighbor 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">
<ip-address>{{ pe_ipadd.lo6 }}</ip-address>
<description>{{ pe_fqdn }}</description>
- <group>iGEANT6-P-ONLY</group>
+ <group>{{ geant_bgp_groups.p_only.ipv6 }}</group>
</neighbor>
{% endfor %}
</bgp>
diff --git a/geant/gap_ansible/roles/ibgp_update/templates/nokia/remove_pe_from_pe.j2 b/geant/gap_ansible/roles/ibgp_update/templates/nokia/remove_pe_from_pe.j2
index 48242b15b64be09b6891a1aabcc9bfc49917d4a8..56b342073dec1079f04c9f8c6b65a57ec8084ecd 100644
--- a/geant/gap_ansible/roles/ibgp_update/templates/nokia/remove_pe_from_pe.j2
+++ b/geant/gap_ansible/roles/ibgp_update/templates/nokia/remove_pe_from_pe.j2
@@ -5,11 +5,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">
<neighbor alu:operation="delete">
<ip-address>{{ subscription.router.router_lo_ipv4_address }}</ip-address>
- <group>iGEANT</group>
+ <group>{{ geant_bgp_groups.pe_mesh.ipv4 }}</group>
</neighbor>
<neighbor alu:operation="delete">
<ip-address>{{ subscription.router.router_lo_ipv6_address }}</ip-address>
- <group>iGEANT6</group>
+ <group>{{ geant_bgp_groups.pe_mesh.ipv6 }}</group>
</neighbor>
</bgp>
</router>
diff --git a/geant/gap_ansible/roles/ibgp_update/templates/nokia/verify_p_ibgp.j2 b/geant/gap_ansible/roles/ibgp_update/templates/nokia/verify_p_ibgp.j2
index 3c30bba2e56bf424f668e999a04a1ce04359f15d..3f3f8d4486b4d28d22c3d87db39517231a8b7861 100644
--- a/geant/gap_ansible/roles/ibgp_update/templates/nokia/verify_p_ibgp.j2
+++ b/geant/gap_ansible/roles/ibgp_update/templates/nokia/verify_p_ibgp.j2
@@ -11,7 +11,7 @@
<as-number>{{ geant_re_as_number }}</as-number>
</local-as>
<group alu:operation="replace">
- <group-name>iGEANT-P-ONLY</group-name>
+ <group-name>{{ geant_bgp_groups.p_only.ipv4 }}</group-name>
<admin-state>enable</admin-state>
<next-hop-self>true</next-hop-self>
<type>internal</type>
@@ -23,7 +23,7 @@
</family>
</group>
<group alu:operation="replace">
- <group-name>iGEANT6-P-ONLY</group-name>
+ <group-name>{{ geant_bgp_groups.p_only.ipv6 }}</group-name>
<next-hop-self>true</next-hop-self>
<type>internal</type>
<peer-as>{{ geant_re_as_number }}</peer-as>
@@ -37,12 +37,12 @@
<neighbor 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">
<ip-address>{{ pe_ipadd.lo4 }}</ip-address>
<description>{{ pe_fqdn }}</description>
- <group>iGEANT-P-ONLY</group>
+ <group>{{ geant_bgp_groups.p_only.ipv4 }}</group>
</neighbor>
<neighbor 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">
<ip-address>{{ pe_ipadd.lo6 }}</ip-address>
<description>{{ pe_fqdn }}</description>
- <group>iGEANT6-P-ONLY</group>
+ <group><{{ geant_bgp_groups.p_only.ipv6 }}/group>
</neighbor>
{% endfor %}
</bgp>