diff --git a/geant/gap_ansible/roles/bgp_config/templates/bgp_neighbor.j2 b/geant/gap_ansible/roles/bgp_config/templates/bgp_neighbor.j2
index f5f2e069f920ebf38e3a6534693e9889f35c3562..71b3d4d9705fb4f36f5ad4784d97a56d85f21264 100644
--- a/geant/gap_ansible/roles/bgp_config/templates/bgp_neighbor.j2
+++ b/geant/gap_ansible/roles/bgp_config/templates/bgp_neighbor.j2
@@ -5,11 +5,12 @@
                     {% if neighbor.bfd_enabled %}
                     <bfd-liveness>true</bfd-liveness>
                     {% endif %}
-
                     {% if neighbor.ip_type == 'ipv4' %}
+                    <local-address>{{ ipv4_local_addr }}</local-address>
                     <description>-- Peering with {{ partner_name | upper }} --</description>
                     <group>{{ bgp.group.ipv4 }}</group>
                     {% elif neighbor.ip_type == 'ipv6' %}
+                    <local-address>{{ ipv6_local_addr }}</local-address>
                     <description>-- IPv6 Peering with {{ partner_name | upper }} --</description>
                     <group>{{ bgp.group.ipv6 }}</group>
                     {% endif %}
diff --git a/geant/gap_ansible/roles/bgp_config/vars/main.yml b/geant/gap_ansible/roles/bgp_config/vars/main.yml
index 5bdb6c9dd621ca56bca93a096c64bb52e05fa670..3f988693f00cf2f320340b7f35bd516e3b2188d9 100644
--- a/geant/gap_ansible/roles/bgp_config/vars/main.yml
+++ b/geant/gap_ansible/roles/bgp_config/vars/main.yml
@@ -3,3 +3,5 @@
 is_standalone_run: false
 
 bgp_obj: "{{ ap.sbp.bgp_session_list }}"
+ipv4_local_addr: "{{ ap.sbp.ipv4_address }}"
+ipv6_local_addr: "{{ ap.sbp.ipv6_address }}"