diff --git a/debian/wit-network-config.postinst b/debian/wit-network-config.postinst
index 0005508..88e549d 100755
--- a/debian/wit-network-config.postinst
+++ b/debian/wit-network-config.postinst
@@ -354,6 +354,7 @@ case "$1" in
                 -e "s/BASTION-PUBLIC-IP/$BASTIONPUBLICIP/" \
                 -e "s/FRR_GRE_ASN/${FRR_GRE_ASN:=$NODEASN}/"  \
                 -e "s/FRRROUTERID/${LOOPBACKv4}/" \
+                -e "s/LOOPBACK-IPV6/${LOOPBACKv6}/" \
                 -e "s/NODEASN/${NODEASN}/"  \
                 $FRRCONFIG
         [ -z $FRR_EDGE_NEIGH ] || sed -i -e 's/!!!  //' $FRRCONFIG
diff --git a/files/frr.conf.wit b/files/frr.conf.wit
index adaffce..a063087 100644
--- a/files/frr.conf.wit
+++ b/files/frr.conf.wit
@@ -270,15 +270,20 @@ route-map LOCALNETSv6 permit 5
 !!!  !
 
 
-!!BASTION  route-map BASTION permit 5
+!!BASTION  route-map BASTIONv4 permit 5
 !!BASTION   match ip address prefix-len 0
 !!BASTION   set src BASTION-PUBLIC-IP
 
-!!BASTION  route-map BASTION permit 10
+!!BASTION  route-map BASTIONv4 permit 10
 !!BASTION   match ip address prefix-list ALL
 
-!!BASTION  ip protocol bgp route-map BASTION
+!!BASTION  ip protocol bgp route-map BASTIONv4
 
+!!BASTION  route-map BASTIONv6 permit 5
+!!BASTION   match ipv6 address prefix-list ALL
+!!BASTION   set src LOOPBACK-IPV6
+
+!!BASTION  ipv6 protocol bgp route-map BASTIONv6
 
 !
 line vty