diff --git a/neutron/files/pike/bagpipe-bgp.conf b/neutron/files/pike/bagpipe-bgp.conf
index d4f8b5c..253191b 100644
--- a/neutron/files/pike/bagpipe-bgp.conf
+++ b/neutron/files/pike/bagpipe-bgp.conf
@@ -1,9 +1,9 @@
 {%- from "neutron/map.jinja" import compute with context -%}
 [BGP]
-local_address = {{ compute.bgp_vpn.bagpipe.local_address }}
-peers = {{ compute.bgp_vpn.bagpipe.peers }}
-my_as = {{ compute.bgp_vpn.bagpipe.get('autonomous_system', 64512) }}
-enable_rtc = {{ compute.bgp_vpn.bagpipe.get('enable_rtc', True) }}
+local_address = {{ compute.bgp_vpn.get('bagpipe', {}).get('local_address', '127.0.0.1') }}
+peers = {{ compute.bgp_vpn.get('bagpipe', {}).get('peers', '127.0.0.1') }}
+my_as = {{ compute.bgp_vpn.get('bagpipe', {}).get('autonomous_system', 64512) }}
+enable_rtc = {{ compute.bgp_vpn.get('bagpipe', {}).get('enable_rtc', True) }}
 
 [COMMON]
 # Root helper and root helper application
diff --git a/neutron/files/queens/bagpipe-bgp.conf b/neutron/files/queens/bagpipe-bgp.conf
index d4f8b5c..253191b 100644
--- a/neutron/files/queens/bagpipe-bgp.conf
+++ b/neutron/files/queens/bagpipe-bgp.conf
@@ -1,9 +1,9 @@
 {%- from "neutron/map.jinja" import compute with context -%}
 [BGP]
-local_address = {{ compute.bgp_vpn.bagpipe.local_address }}
-peers = {{ compute.bgp_vpn.bagpipe.peers }}
-my_as = {{ compute.bgp_vpn.bagpipe.get('autonomous_system', 64512) }}
-enable_rtc = {{ compute.bgp_vpn.bagpipe.get('enable_rtc', True) }}
+local_address = {{ compute.bgp_vpn.get('bagpipe', {}).get('local_address', '127.0.0.1') }}
+peers = {{ compute.bgp_vpn.get('bagpipe', {}).get('peers', '127.0.0.1') }}
+my_as = {{ compute.bgp_vpn.get('bagpipe', {}).get('autonomous_system', 64512) }}
+enable_rtc = {{ compute.bgp_vpn.get('bagpipe', {}).get('enable_rtc', True) }}
 
 [COMMON]
 # Root helper and root helper application