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 dc71e135265b4cde7a6c3d7b74fd0f3ff28f2e2e..f5f2e069f920ebf38e3a6534693e9889f35c3562 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 %}
-                    <description>{{ partner_name | upper }}_{{ partner.type }}</description>
 
                     {% if neighbor.ip_type == 'ipv4' %}
+                    <description>-- Peering with {{ partner_name | upper }} --</description>
                     <group>{{ bgp.group.ipv4 }}</group>
                     {% elif neighbor.ip_type == 'ipv6' %}
+                    <description>-- IPv6 Peering with {{ partner_name | upper }} --</description>
                     <group>{{ bgp.group.ipv6 }}</group>
                     {% endif %}
                     <peer-as>{{ partner.asn }}</peer-as>