diff --git a/configs/leaf8.cfg b/configs/leaf8.cfg
index 0439cb8..9ddcb99 100644
--- a/configs/leaf8.cfg
+++ b/configs/leaf8.cfg
@@ -160,17 +160,6 @@ router bgp 65004
    neighbor 10.0.250.1 peer group evpn
    neighbor 10.0.250.2 peer group evpn
    !
-   ! VRF Gold configuration
-   vrf gold
-      rd 10.0.250.18:1
-      route-target import evpn 1:100001
-      route-target export evpn 1:100001
-      neighbor 10.90.90.1 remote-as 64999
-      redistribute connected
-      !
-      address-family ipv4
-         neighbor 10.90.90.1 activate
-   !
    ! IPv4 address family
    address-family ipv4
       neighbor underlay activate
@@ -181,5 +170,16 @@ router bgp 65004
    ! EVPN address family
    address-family evpn
       neighbor evpn activate
+   !
+   ! VRF Gold configuration
+   vrf gold
+      rd 10.0.250.18:1
+      route-target import evpn 1:100001
+      route-target export evpn 1:100001
+      neighbor 10.90.90.1 remote-as 64999
+      redistribute connected
+      !
+      address-family ipv4
+         neighbor 10.90.90.1 activate
 !
 end