diff --git a/roles/network_plugin/calico/tasks/install.yml b/roles/network_plugin/calico/tasks/install.yml
index fb202611f3c504e4dcdd475a548d99dd416361c3..9237cb5879abb8205a8dcefded5108f6bb34184b 100644
--- a/roles/network_plugin/calico/tasks/install.yml
+++ b/roles/network_plugin/calico/tasks/install.yml
@@ -227,7 +227,7 @@
       {"apiVersion": "projectcalico.org/v3",
       "kind": "BGPPeer",
       "metadata": {
-        "name": "global-{{ item.router_id }}"
+        "name": "global-{{ item.name | default(item.router_id|replace(':','-')) }}"
       },
       "spec": {
         "asNumber": "{{ item.as }}",
@@ -381,7 +381,7 @@
       {"apiVersion": "projectcalico.org/v3",
       "kind": "BGPPeer",
       "metadata": {
-        "name": "{{ inventory_hostname }}-{{ item.router_id }}"
+        "name": "{{ inventory_hostname }}-{{ item.name | default(item.router_id|replace(':','-')) }}"
       },
       "spec": {
         "asNumber": "{{ item.as }}",