diff --git a/roles/service-bird-ffrl/templates/ffrl_ipv4_peers.conf.j2 b/roles/service-bird-ffrl/templates/ffrl_ipv4_peers.conf.j2
index 4403306..c192683 100644
--- a/roles/service-bird-ffrl/templates/ffrl_ipv4_peers.conf.j2
+++ b/roles/service-bird-ffrl/templates/ffrl_ipv4_peers.conf.j2
@@ -3,7 +3,7 @@
 #
 
 {% for peer_id, peer_value in ffrl_exit_server.items() %}
-protocol bgp '{{ peer_id }}' from ffrl_uplink {
+protocol bgp '{{ peer_id.replace('-','_') }}' from ffrl_uplink {
     source address {{ peer_value.tunnel_ipv4_network | ipaddr('net') | ipaddr('1') | ipaddr('address') }};
     neighbor {{ peer_value.tunnel_ipv4_network | ipaddr('net') | ipaddr('address') }} as ffrl_as;
 };
diff --git a/roles/service-bird-ffrl/templates/ffrl_ipv6_peers.conf.j2 b/roles/service-bird-ffrl/templates/ffrl_ipv6_peers.conf.j2
index cae7201..74d189b 100644
--- a/roles/service-bird-ffrl/templates/ffrl_ipv6_peers.conf.j2
+++ b/roles/service-bird-ffrl/templates/ffrl_ipv6_peers.conf.j2
@@ -3,7 +3,7 @@
 #
 
 {% for peer_id, peer_value in ffrl_exit_server.items() %}
-protocol bgp '{{ peer_id }}' from ffrl_uplink {
+protocol bgp '{{ peer_id.replace('-','_') }}' from ffrl_uplink {
     source address {{ peer_value.tunnel_ipv6_network | ipaddr('net') | ipaddr('2') | ipaddr('address') }};
     neighbor {{ peer_value.tunnel_ipv6_network | ipaddr('net') | ipaddr('1') | ipaddr('address') }} as ffrl_as;
 };