diff --git a/routing/anycast-bgp-addpath/topology-external-next-hop.yml b/routing/anycast-bgp-addpath/topology-external-next-hop.yml
index 2511c3d..aadf888 100644
--- a/routing/anycast-bgp-addpath/topology-external-next-hop.yml
+++ b/routing/anycast-bgp-addpath/topology-external-next-hop.yml
@@ -8,10 +8,8 @@
 
 module: [ ospf, bgp ]
 
-defaults.bgp.extra_attributes.node: [ anycast ]
-
-defaults:
-  device: iosv
+defaults.bgp.attributes.node.anycast: { type: ipv4, use: prefix }
+defaults.device: iosv
 
 bgp:
   ebgp_role: stub
diff --git a/routing/anycast-bgp-addpath/topology.yml b/routing/anycast-bgp-addpath/topology.yml
index deb9551..a7bfb1a 100644
--- a/routing/anycast-bgp-addpath/topology.yml
+++ b/routing/anycast-bgp-addpath/topology.yml
@@ -7,10 +7,8 @@
 
 module: [ ospf, bgp ]
 
-defaults.bgp.extra_attributes.node: [ anycast ]
-
-defaults:
-  device: iosv
+defaults.bgp.attributes.node.anycast: { type: ipv4, use: prefix }
+defaults.device: iosv
 
 bgp:
   as_list:
@@ -25,9 +23,8 @@ groups:
     config: [ bgp-addpath.j2 ]
   as65101:
     config: [ bgp-anycast.j2 ]
-    node_data:
-      bgp.anycast: 10.42.42.42/32
-      bgp.advertise_loopback: False
+    bgp.anycast: 10.42.42.42/32
+    bgp.advertise_loopback: False
 
 nodes: 
   [ l1, l2, l3, s1, a1, a2, a3 ]