diff --git a/geant/gap_ansible/roles/sbp/templates/deploy_sbp.j2 b/geant/gap_ansible/roles/sbp/templates/deploy_sbp.j2
index 7aa5ef4bcdbac3daa6950773a4b4e35e1b1b94a1..07b1b5d41453e038eb6a2238db91024378f399de 100644
--- a/geant/gap_ansible/roles/sbp/templates/deploy_sbp.j2
+++ b/geant/gap_ansible/roles/sbp/templates/deploy_sbp.j2
@@ -14,9 +14,9 @@
                 <interface alu:operation="replace">
                     <interface-name>{{ lag_name }}.{{ ap.sbp.vlan_id }}</interface-name>
                 {% if subscription.l3_core_service_type in ['GEANT_IP', 'GEANT IP'] %}
-                    <description>SRV_GLOBAL CUSTOMER {{ partner_name }} #{{ partner_name }}-{{ ap.ap_type }} ${{ ap.sbp.gs_id }} | ASN{{ partner.asn }} | </description>
+                    <description>SRV_GLOBAL CUSTOMER {{ partner_name }} {{ '#'+ap.custom_service_name if ap.custom_service_name is string }} ${{ ap.sbp.gs_id }} | ASN{{ partner.asn }} | </description>
                 {% elif subscription.l3_core_service_type in ['LHCONE'] %}
-                    <description>SRV_L3VPN CUSTOMER {{ partner_name }} #{{ partner_name }}-{{ ap.ap_type }} ${{ ap.sbp.gs_id }} | ASN{{ partner.asn }} | </description>
+                    <description>SRV_L3VPN CUSTOMER {{ partner_name }} {{ '#'+ap.custom_service_name if ap.custom_service_name is string }} ${{ ap.sbp.gs_id }} | ASN{{ partner.asn }} | </description>
                 {% endif %}
                     <ip-mtu>{{ sbp_params.ip_mtu }}</ip-mtu>
                     <sap>