diff --git a/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF1A.md b/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF1A.md
index 51e25775162..c51b6f3709b 100644
--- a/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF1A.md
+++ b/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF1A.md
@@ -1481,8 +1481,8 @@ no ip routing vrf MGMT
 
 ```eos
 !
-ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 ip route 0.0.0.0/0 10.10.10.1
+ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 ```
 
 ## Multicast
diff --git a/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF1B.md b/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF1B.md
index f53463de078..d7716c83455 100644
--- a/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF1B.md
+++ b/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF1B.md
@@ -1481,8 +1481,8 @@ no ip routing vrf MGMT
 
 ```eos
 !
-ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 ip route 0.0.0.0/0 10.10.10.1
+ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 ```
 
 ## Multicast
diff --git a/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF2A.md b/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF2A.md
index d11cd5041d2..093de3e9117 100644
--- a/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF2A.md
+++ b/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF2A.md
@@ -6847,8 +6847,8 @@ no ip routing vrf MGMT
 
 ```eos
 !
-ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 ip route 0.0.0.0/0 10.10.10.1
+ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 ```
 
 ## Multicast
diff --git a/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3A.md b/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3A.md
index c12c8f77d01..977d97b6119 100644
--- a/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3A.md
+++ b/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3A.md
@@ -2588,8 +2588,8 @@ no ip routing vrf MGMT
 
 ```eos
 !
-ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 ip route 0.0.0.0/0 10.10.10.1
+ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 ```
 
 ## Multicast
diff --git a/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3B.md b/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3B.md
index 0bf9ec18635..b7300a3df5f 100644
--- a/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3B.md
+++ b/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3B.md
@@ -2588,8 +2588,8 @@ no ip routing vrf MGMT
 
 ```eos
 !
-ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 ip route 0.0.0.0/0 10.10.10.1
+ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 ```
 
 ## Multicast
diff --git a/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3C.md b/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3C.md
index c2e9b878a7a..a5fd429f6ab 100644
--- a/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3C.md
+++ b/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3C.md
@@ -2477,8 +2477,8 @@ no ip routing vrf MGMT
 
 ```eos
 !
-ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 ip route 0.0.0.0/0 10.10.10.1
+ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 ```
 
 ## Multicast
diff --git a/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3D.md b/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3D.md
index b95b119f01f..249689e2cc3 100644
--- a/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3D.md
+++ b/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3D.md
@@ -2477,8 +2477,8 @@ no ip routing vrf MGMT
 
 ```eos
 !
-ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 ip route 0.0.0.0/0 10.10.10.1
+ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 ```
 
 ## Multicast
diff --git a/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3E.md b/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3E.md
index 7a5ee120e49..7ab0aa8a133 100644
--- a/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3E.md
+++ b/ansible_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3E.md
@@ -2477,8 +2477,8 @@ no ip routing vrf MGMT
 
 ```eos
 !
-ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 ip route 0.0.0.0/0 10.10.10.1
+ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 ```
 
 ## Multicast
diff --git a/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF1A.cfg b/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF1A.cfg
index 8e0522989a2..a67c9e8d893 100644
--- a/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF1A.cfg
+++ b/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF1A.cfg
@@ -1063,8 +1063,8 @@ mlag configuration
    reload-delay mlag 300
    reload-delay non-mlag 330
 !
-ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 ip route 0.0.0.0/0 10.10.10.1
+ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 !
 ntp local-interface vrf MGMT Management0
 ntp server vrf MGMT pool.ntp.org
diff --git a/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF1B.cfg b/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF1B.cfg
index 01b5c956126..af1c4a39c0b 100644
--- a/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF1B.cfg
+++ b/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF1B.cfg
@@ -1063,8 +1063,8 @@ mlag configuration
    reload-delay mlag 300
    reload-delay non-mlag 330
 !
-ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 ip route 0.0.0.0/0 10.10.10.1
+ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 !
 ntp local-interface vrf MGMT Management0
 ntp server vrf MGMT pool.ntp.org
diff --git a/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF2A.cfg b/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF2A.cfg
index 73ace9f104c..f041fe48a40 100644
--- a/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF2A.cfg
+++ b/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF2A.cfg
@@ -6070,8 +6070,8 @@ interface Vlan10
    ip address 10.10.10.8/24
 no ip routing vrf MGMT
 !
-ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 ip route 0.0.0.0/0 10.10.10.1
+ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 !
 ntp local-interface vrf MGMT Management0
 ntp server vrf MGMT pool.ntp.org
diff --git a/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF3A.cfg b/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF3A.cfg
index 0633ee8f2ea..990c08a14b5 100644
--- a/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF3A.cfg
+++ b/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF3A.cfg
@@ -2067,8 +2067,8 @@ mlag configuration
    reload-delay mlag 300
    reload-delay non-mlag 330
 !
-ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 ip route 0.0.0.0/0 10.10.10.1
+ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 !
 ntp local-interface vrf MGMT Management0
 ntp server vrf MGMT pool.ntp.org
diff --git a/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF3B.cfg b/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF3B.cfg
index 32689b04ce0..bf56ae12afe 100644
--- a/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF3B.cfg
+++ b/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF3B.cfg
@@ -2067,8 +2067,8 @@ mlag configuration
    reload-delay mlag 300
    reload-delay non-mlag 330
 !
-ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 ip route 0.0.0.0/0 10.10.10.1
+ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 !
 ntp local-interface vrf MGMT Management0
 ntp server vrf MGMT pool.ntp.org
diff --git a/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF3C.cfg b/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF3C.cfg
index 5c839f91b8d..ef60e00950a 100644
--- a/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF3C.cfg
+++ b/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF3C.cfg
@@ -1990,8 +1990,8 @@ interface Vlan10
    ip address 10.10.10.11/24
 no ip routing vrf MGMT
 !
-ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 ip route 0.0.0.0/0 10.10.10.1
+ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 !
 ntp local-interface vrf MGMT Management0
 ntp server vrf MGMT pool.ntp.org
diff --git a/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF3D.cfg b/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF3D.cfg
index 9024a9ea570..f833a80e76c 100644
--- a/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF3D.cfg
+++ b/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF3D.cfg
@@ -1990,8 +1990,8 @@ interface Vlan10
    ip address 10.10.10.12/24
 no ip routing vrf MGMT
 !
-ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 ip route 0.0.0.0/0 10.10.10.1
+ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 !
 ntp local-interface vrf MGMT Management0
 ntp server vrf MGMT pool.ntp.org
diff --git a/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF3E.cfg b/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF3E.cfg
index 7e5caeef5ff..fdd44a162d5 100644
--- a/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF3E.cfg
+++ b/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/LEAF3E.cfg
@@ -1990,8 +1990,8 @@ interface Vlan10
    ip address 10.10.10.13/24
 no ip routing vrf MGMT
 !
-ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 ip route 0.0.0.0/0 10.10.10.1
+ip route vrf MGMT 0.0.0.0/0 172.16.100.1
 !
 ntp local-interface vrf MGMT Management0
 ntp server vrf MGMT pool.ntp.org
diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/static-routes.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/static-routes.md
index af3d485e50c..993f53b249d 100644
--- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/static-routes.md
+++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/static-routes.md
@@ -58,10 +58,10 @@ interface Management1
 !
 ip route 1.1.1.0/24 Vlan101 10.1.1.1
 ip route 1.1.2.0/24 Vlan101 10.1.1.1 200 tag 666 name RT-TO-FAKE-DMZ
-ip route vrf customer01 1.2.1.0/24 Vlan202 10.1.2.1
-ip route vrf customer01 1.2.2.0/24 Vlan101 10.1.2.1 201 tag 667 name RT-TO-FAKE-DMZ
 ip route vrf APP 10.3.4.0/24 1.2.3.4
 ip route vrf APP 10.3.5.0/24 Null0
+ip route vrf customer01 1.2.1.0/24 Vlan202 10.1.2.1
+ip route vrf customer01 1.2.2.0/24 Vlan101 10.1.2.1 201 tag 667 name RT-TO-FAKE-DMZ
 ip route vrf customer01 10.3.6.0/24 Ethernet40 11.2.1.1 track bfd 100 tag 1000 name Track-BFD metric 300
 ip route vrf customer01 10.3.7.0/24 Ethernet41 100 tag 1000 name No-Track-BFD metric 300
 ```
diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/system.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/system.md
index feca39283ba..b09a9142548 100644
--- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/system.md
+++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/system.md
@@ -66,13 +66,13 @@ interface Management1
 system control-plane
    tcp mss ceiling ipv4 1344 ipv6 1366
    ip access-group acl4_1 in
+   ip access-group acl4_3 vrf default in
    ip access-group acl4_2 vrf red in
    ip access-group acl4_2 vrf red_1 in
-   ip access-group acl4_3 vrf default in
    ipv6 access-group acl6_1 in
+   ipv6 access-group acl6_3 vrf default in
    ipv6 access-group acl6_2 vrf blue in
    ipv6 access-group acl6_2 vrf blue_1 in
-   ipv6 access-group acl6_3 vrf default in
 ```
 
 ## System L1
diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/static-routes.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/static-routes.cfg
index 9d81dc6164a..3d7a7c00537 100644
--- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/static-routes.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/static-routes.cfg
@@ -6,9 +6,9 @@ interface Management1
 !
 ip route 1.1.1.0/24 Vlan101 10.1.1.1
 ip route 1.1.2.0/24 Vlan101 10.1.1.1 200 tag 666 name RT-TO-FAKE-DMZ
-ip route vrf customer01 1.2.1.0/24 Vlan202 10.1.2.1
-ip route vrf customer01 1.2.2.0/24 Vlan101 10.1.2.1 201 tag 667 name RT-TO-FAKE-DMZ
 ip route vrf APP 10.3.4.0/24 1.2.3.4
 ip route vrf APP 10.3.5.0/24 Null0
+ip route vrf customer01 1.2.1.0/24 Vlan202 10.1.2.1
+ip route vrf customer01 1.2.2.0/24 Vlan101 10.1.2.1 201 tag 667 name RT-TO-FAKE-DMZ
 ip route vrf customer01 10.3.6.0/24 Ethernet40 11.2.1.1 track bfd 100 tag 1000 name Track-BFD metric 300
 ip route vrf customer01 10.3.7.0/24 Ethernet41 100 tag 1000 name No-Track-BFD metric 300
diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/system.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/system.cfg
index 871af45d159..d246010a90b 100644
--- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/system.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/system.cfg
@@ -11,10 +11,10 @@ interface Management1
 system control-plane
    tcp mss ceiling ipv4 1344 ipv6 1366
    ip access-group acl4_1 in
+   ip access-group acl4_3 vrf default in
    ip access-group acl4_2 vrf red in
    ip access-group acl4_2 vrf red_1 in
-   ip access-group acl4_3 vrf default in
    ipv6 access-group acl6_1 in
+   ipv6 access-group acl6_3 vrf default in
    ipv6 access-group acl6_2 vrf blue in
    ipv6 access-group acl6_2 vrf blue_1 in
-   ipv6 access-group acl6_3 vrf default in
diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SVC3A.md b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SVC3A.md
index e7d8c6984e5..9bda09b73b7 100644
--- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SVC3A.md
+++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SVC3A.md
@@ -508,6 +508,7 @@ interface Port-Channel10
    switchport trunk allowed vlan 110-111,210-211
    switchport mode trunk
    switchport
+   !
    evpn ethernet-segment
       identifier 0000:0000:0303:0202:0101
       route-target import 03:03:02:02:01:01
diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-SVC3A.cfg b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-SVC3A.cfg
index 68c20619bbb..6c8bea64a4f 100644
--- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-SVC3A.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-SVC3A.cfg
@@ -162,6 +162,7 @@ interface Port-Channel10
    switchport trunk allowed vlan 110-111,210-211
    switchport mode trunk
    switchport
+   !
    evpn ethernet-segment
       identifier 0000:0000:0303:0202:0101
       route-target import 03:03:02:02:01:01
diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/cvp-empty-filter/cv_server_configlets.yml b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/cvp-empty-filter/cv_server_configlets.yml
index 17e4750d28d..d312fb2a048 100644
--- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/cvp-empty-filter/cv_server_configlets.yml
+++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/cvp-empty-filter/cv_server_configlets.yml
@@ -1087,7 +1087,7 @@ cvp_configlets:
     trunk allowed vlan 110-111,120-121,130-131,140-141,150,210-211,250,310-311,350\n
     \  switchport mode trunk\n   switchport\n   mlag 7\n!\ninterface Port-Channel10\n
     \  description SERVER_server03_ESI\n   no shutdown\n   switchport trunk allowed
-    vlan 110-111,210-211\n   switchport mode trunk\n   switchport\n   evpn ethernet-segment\n
+    vlan 110-111,210-211\n   switchport mode trunk\n   switchport\n   !\n   evpn ethernet-segment\n
     \     identifier 0000:0000:0303:0202:0101\n      route-target import 03:03:02:02:01:01\n
     \  lacp system-id 0303.0202.0101\n!\ninterface Ethernet1\n   description P2P_DC1-SPINE1_Ethernet4\n
     \  no shutdown\n   mtu 1500\n   no switchport\n   ip address 172.31.255.25/31\n!\ninterface
diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/cvp/cv_server_configlets.yml b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/cvp/cv_server_configlets.yml
index 17e4750d28d..d312fb2a048 100644
--- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/cvp/cv_server_configlets.yml
+++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/cvp/cv_server_configlets.yml
@@ -1087,7 +1087,7 @@ cvp_configlets:
     trunk allowed vlan 110-111,120-121,130-131,140-141,150,210-211,250,310-311,350\n
     \  switchport mode trunk\n   switchport\n   mlag 7\n!\ninterface Port-Channel10\n
     \  description SERVER_server03_ESI\n   no shutdown\n   switchport trunk allowed
-    vlan 110-111,210-211\n   switchport mode trunk\n   switchport\n   evpn ethernet-segment\n
+    vlan 110-111,210-211\n   switchport mode trunk\n   switchport\n   !\n   evpn ethernet-segment\n
     \     identifier 0000:0000:0303:0202:0101\n      route-target import 03:03:02:02:01:01\n
     \  lacp system-id 0303.0202.0101\n!\ninterface Ethernet1\n   description P2P_DC1-SPINE1_Ethernet4\n
     \  no shutdown\n   mtu 1500\n   no switchport\n   ip address 172.31.255.25/31\n!\ninterface
diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/BGP-LEAF1.md b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/BGP-LEAF1.md
index 85b829c0e18..e279c99141c 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/BGP-LEAF1.md
+++ b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/BGP-LEAF1.md
@@ -282,8 +282,8 @@ no ip routing vrf MGMT
 
 ```eos
 !
-ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 ip route 0.0.0.0/0 172.23.254.1
+ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 ```
 
 ## Multicast
diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/BGP-LEAF2.md b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/BGP-LEAF2.md
index 87b6baa8c75..09d0e437278 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/BGP-LEAF2.md
+++ b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/BGP-LEAF2.md
@@ -237,8 +237,8 @@ no ip routing vrf MGMT
 
 ```eos
 !
-ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 ip route 0.0.0.0/0 172.23.254.1
+ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 ```
 
 ## Multicast
diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/BGP-SPINE2.md b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/BGP-SPINE2.md
index 4aeba46201e..8bc78b22806 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/BGP-SPINE2.md
+++ b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/BGP-SPINE2.md
@@ -412,8 +412,8 @@ no ip routing vrf MGMT
 
 ```eos
 !
-ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 ip route 10.0.0.0/8 10.1.100.100
+ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 ```
 
 ### Router BGP
diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/ISIS-LEAF1.md b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/ISIS-LEAF1.md
index 08b4973821f..5f5461b42f0 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/ISIS-LEAF1.md
+++ b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/ISIS-LEAF1.md
@@ -243,8 +243,8 @@ no ip routing vrf MGMT
 
 ```eos
 !
-ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 ip route 0.0.0.0/0 172.23.254.1
+ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 ```
 
 ## Multicast
diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/ISIS-SPINE1.md b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/ISIS-SPINE1.md
index 9b3e5e99271..cdb63d9d104 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/ISIS-SPINE1.md
+++ b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/ISIS-SPINE1.md
@@ -312,8 +312,8 @@ no ip routing vrf MGMT
 
 ```eos
 !
-ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 ip route 10.1.0.0/16 10.1.100.100
+ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 ```
 
 ### Router ISIS
diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/L2ONLY-LEAF1.md b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/L2ONLY-LEAF1.md
index e26e2892ebb..0f1571047cb 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/L2ONLY-LEAF1.md
+++ b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/L2ONLY-LEAF1.md
@@ -237,8 +237,8 @@ no ip routing vrf MGMT
 
 ```eos
 !
-ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 ip route 0.0.0.0/0 172.23.254.1
+ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 ```
 
 ## Multicast
diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/L2ONLY-LEAF2.md b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/L2ONLY-LEAF2.md
index c7e4935f4a4..e91a2d91424 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/L2ONLY-LEAF2.md
+++ b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/L2ONLY-LEAF2.md
@@ -237,8 +237,8 @@ no ip routing vrf MGMT
 
 ```eos
 !
-ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 ip route 0.0.0.0/0 172.23.254.1
+ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 ```
 
 ## Multicast
diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/OSPF-LEAF1.md b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/OSPF-LEAF1.md
index f7e5db54d62..a913699e31e 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/OSPF-LEAF1.md
+++ b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/OSPF-LEAF1.md
@@ -237,8 +237,8 @@ no ip routing vrf MGMT
 
 ```eos
 !
-ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 ip route 0.0.0.0/0 172.23.254.1
+ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 ```
 
 ## Multicast
diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/OSPF-LEAF2.md b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/OSPF-LEAF2.md
index f86d912da44..01961c0a16a 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/OSPF-LEAF2.md
+++ b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/OSPF-LEAF2.md
@@ -237,8 +237,8 @@ no ip routing vrf MGMT
 
 ```eos
 !
-ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 ip route 0.0.0.0/0 172.23.254.1
+ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 ```
 
 ## Multicast
diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/OSPF-SPINE2.md b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/OSPF-SPINE2.md
index 9195ffed613..cb15ba7ec5d 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/OSPF-SPINE2.md
+++ b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/documentation/devices/OSPF-SPINE2.md
@@ -382,8 +382,8 @@ no ip routing vrf MGMT
 
 ```eos
 !
-ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 ip route 10.0.0.0/8 10.1.100.100
+ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 ```
 
 ### Router OSPF
diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/BGP-LEAF1.cfg b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/BGP-LEAF1.cfg
index e543e302972..25b9587221f 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/BGP-LEAF1.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/BGP-LEAF1.cfg
@@ -95,7 +95,7 @@ interface Vlan4092
    ip address 172.23.254.4/24
 no ip routing vrf MGMT
 !
-ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 ip route 0.0.0.0/0 172.23.254.1
+ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 !
 end
diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/BGP-LEAF2.cfg b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/BGP-LEAF2.cfg
index 6aac8b8e64f..721b8bfb584 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/BGP-LEAF2.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/BGP-LEAF2.cfg
@@ -63,7 +63,7 @@ interface Vlan4092
    ip address 172.23.254.5/24
 no ip routing vrf MGMT
 !
-ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 ip route 0.0.0.0/0 172.23.254.1
+ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 !
 end
diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/BGP-SPINE2.cfg b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/BGP-SPINE2.cfg
index 1c452d7aada..17de0c20f9d 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/BGP-SPINE2.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/BGP-SPINE2.cfg
@@ -143,8 +143,8 @@ mlag configuration
    reload-delay mlag 300
    reload-delay non-mlag 330
 !
-ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 ip route 10.0.0.0/8 10.1.100.100
+ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 !
 route-map RM-MLAG-PEER-IN permit 10
    description Make routes learned over MLAG Peer-link less preferred on spines to ensure optimal routing
diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/ISIS-LEAF1.cfg b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/ISIS-LEAF1.cfg
index c0fcdef3c98..980aaf6e476 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/ISIS-LEAF1.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/ISIS-LEAF1.cfg
@@ -50,7 +50,7 @@ interface Vlan4092
    ip address 172.23.254.4/24
 no ip routing vrf MGMT
 !
-ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 ip route 0.0.0.0/0 172.23.254.1
+ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 !
 end
diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/ISIS-SPINE1.cfg b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/ISIS-SPINE1.cfg
index 99e81a75881..eedf3b43bde 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/ISIS-SPINE1.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/ISIS-SPINE1.cfg
@@ -75,8 +75,8 @@ ip virtual-router mac-address 00:1c:73:00:00:9a
 ip routing
 no ip routing vrf MGMT
 !
-ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 ip route 10.1.0.0/16 10.1.100.100
+ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 !
 router isis EVPN_UNDERLAY
    net 49.0001.1921.6825.5001.00
diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/L2ONLY-LEAF1.cfg b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/L2ONLY-LEAF1.cfg
index 54240708d92..52584d6f5af 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/L2ONLY-LEAF1.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/L2ONLY-LEAF1.cfg
@@ -63,7 +63,7 @@ interface Vlan4092
    ip address 172.23.254.4/24
 no ip routing vrf MGMT
 !
-ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 ip route 0.0.0.0/0 172.23.254.1
+ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 !
 end
diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/L2ONLY-LEAF2.cfg b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/L2ONLY-LEAF2.cfg
index d0ac472b116..21780de5845 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/L2ONLY-LEAF2.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/L2ONLY-LEAF2.cfg
@@ -63,7 +63,7 @@ interface Vlan4092
    ip address 172.23.254.5/24
 no ip routing vrf MGMT
 !
-ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 ip route 0.0.0.0/0 172.23.254.1
+ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 !
 end
diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/OSPF-LEAF1.cfg b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/OSPF-LEAF1.cfg
index 11409fa16a9..b87f525da01 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/OSPF-LEAF1.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/OSPF-LEAF1.cfg
@@ -63,7 +63,7 @@ interface Vlan4092
    ip address 172.23.254.4/24
 no ip routing vrf MGMT
 !
-ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 ip route 0.0.0.0/0 172.23.254.1
+ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 !
 end
diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/OSPF-LEAF2.cfg b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/OSPF-LEAF2.cfg
index d7b901c5c92..d37a3005226 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/OSPF-LEAF2.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/OSPF-LEAF2.cfg
@@ -63,7 +63,7 @@ interface Vlan4092
    ip address 172.23.254.5/24
 no ip routing vrf MGMT
 !
-ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 ip route 0.0.0.0/0 172.23.254.1
+ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 !
 end
diff --git a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/OSPF-SPINE2.cfg b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/OSPF-SPINE2.cfg
index 0d3424a36eb..4f1a241cdfa 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/OSPF-SPINE2.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs-l2ls/intended/configs/OSPF-SPINE2.cfg
@@ -124,8 +124,8 @@ mlag configuration
    reload-delay mlag 300
    reload-delay non-mlag 330
 !
-ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 ip route 10.0.0.0/8 10.1.100.100
+ip route vrf MGMT 0.0.0.0/0 172.31.0.1
 !
 router ospf 100
    router-id 192.168.255.2
diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-L2LEAF1A.md b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-L2LEAF1A.md
index 85bee7cf3ba..482a7db3ec4 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-L2LEAF1A.md
+++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-L2LEAF1A.md
@@ -270,8 +270,8 @@ no ip routing vrf MGMT
 
 ```eos
 !
-ip route vrf MGMT 0.0.0.0/0 192.168.1.254
 ip route 0.0.0.0/0 172.21.110.1
+ip route vrf MGMT 0.0.0.0/0 192.168.1.254
 ```
 
 ## Multicast
diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-L2LEAF2A.md b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-L2LEAF2A.md
index e9e9855ab1a..bd216143a77 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-L2LEAF2A.md
+++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-L2LEAF2A.md
@@ -382,8 +382,8 @@ no ip routing vrf MGMT
 
 ```eos
 !
-ip route vrf MGMT 0.0.0.0/0 192.168.1.254
 ip route 0.0.0.0/0 172.21.110.1
+ip route vrf MGMT 0.0.0.0/0 192.168.1.254
 ```
 
 ## Multicast
diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-L2LEAF2B.md b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-L2LEAF2B.md
index e4d6411a026..47a2a9619db 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-L2LEAF2B.md
+++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC1-POD1-L2LEAF2B.md
@@ -410,8 +410,8 @@ no ip routing vrf MGMT
 
 ```eos
 !
-ip route vrf MGMT 0.0.0.0/0 192.168.1.254
 ip route 0.0.0.0/0 172.21.110.1
+ip route vrf MGMT 0.0.0.0/0 192.168.1.254
 ```
 
 ## Multicast
diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-L2LEAF1A.md b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-L2LEAF1A.md
index b7ba833f92c..9f08e6c814a 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-L2LEAF1A.md
+++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-L2LEAF1A.md
@@ -298,8 +298,8 @@ no ip routing vrf MGMT
 
 ```eos
 !
-ip route vrf MGMT 0.0.0.0/0 192.168.1.254
 ip route 0.0.0.0/0 172.21.210.1
+ip route vrf MGMT 0.0.0.0/0 192.168.1.254
 ```
 
 ## Multicast
diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-L2LEAF2A.md b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-L2LEAF2A.md
index c52f87bc13f..33858fe36f0 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-L2LEAF2A.md
+++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-L2LEAF2A.md
@@ -298,8 +298,8 @@ no ip routing vrf MGMT
 
 ```eos
 !
-ip route vrf MGMT 0.0.0.0/0 192.168.1.254
 ip route 0.0.0.0/0 172.21.210.1
+ip route vrf MGMT 0.0.0.0/0 192.168.1.254
 ```
 
 ## Multicast
diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD1-L2LEAF1A.cfg b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD1-L2LEAF1A.cfg
index d9c71447bd6..b21d4efe99c 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD1-L2LEAF1A.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD1-L2LEAF1A.cfg
@@ -48,8 +48,8 @@ interface Vlan4085
    ip address 172.21.110.4/24
 no ip routing vrf MGMT
 !
-ip route vrf MGMT 0.0.0.0/0 192.168.1.254
 ip route 0.0.0.0/0 172.21.110.1
+ip route vrf MGMT 0.0.0.0/0 192.168.1.254
 !
 interface Loopback1111
   description Loopback created from raw_eos_cli under platform_settings vEOS-LAB
diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD1-L2LEAF2A.cfg b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD1-L2LEAF2A.cfg
index 0e5a6ef7c6d..1bba2933c28 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD1-L2LEAF2A.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD1-L2LEAF2A.cfg
@@ -121,8 +121,8 @@ mlag configuration
    reload-delay mlag 300
    reload-delay non-mlag 330
 !
-ip route vrf MGMT 0.0.0.0/0 192.168.1.254
 ip route 0.0.0.0/0 172.21.110.1
+ip route vrf MGMT 0.0.0.0/0 192.168.1.254
 !
 interface Loopback1002
   description Loopback created from raw_eos_cli under l2leaf node-group RACK2_MLAG
diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD1-L2LEAF2B.cfg b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD1-L2LEAF2B.cfg
index b04cba58c27..e46c78ed78b 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD1-L2LEAF2B.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC1-POD1-L2LEAF2B.cfg
@@ -127,8 +127,8 @@ mlag configuration
    reload-delay mlag 300
    reload-delay non-mlag 330
 !
-ip route vrf MGMT 0.0.0.0/0 192.168.1.254
 ip route 0.0.0.0/0 172.21.110.1
+ip route vrf MGMT 0.0.0.0/0 192.168.1.254
 !
 interface Loopback1003
   description Loopback created from raw_eos_cli under l2leaf node DC1-POD1-L2LEAF2B
diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-POD1-L2LEAF1A.cfg b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-POD1-L2LEAF1A.cfg
index c0602828b2e..cd1263d9f92 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-POD1-L2LEAF1A.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-POD1-L2LEAF1A.cfg
@@ -54,8 +54,8 @@ interface Vlan4092
    ip address 172.21.210.4/24
 no ip routing vrf MGMT
 !
-ip route vrf MGMT 0.0.0.0/0 192.168.1.254
 ip route 0.0.0.0/0 172.21.210.1
+ip route vrf MGMT 0.0.0.0/0 192.168.1.254
 !
 interface Loopback1011
   description Loopback created from raw_eos_cli under l2leaf defaults in DC2 POD1
diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-POD1-L2LEAF2A.cfg b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-POD1-L2LEAF2A.cfg
index b19d0c16683..fad7b09c1ce 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-POD1-L2LEAF2A.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-POD1-L2LEAF2A.cfg
@@ -54,8 +54,8 @@ interface Vlan4092
    ip address 172.21.210.5/24
 no ip routing vrf MGMT
 !
-ip route vrf MGMT 0.0.0.0/0 192.168.1.254
 ip route 0.0.0.0/0 172.21.210.1
+ip route vrf MGMT 0.0.0.0/0 192.168.1.254
 !
 interface Loopback1011
   description Loopback created from raw_eos_cli under l2leaf defaults in DC2 POD1
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MH-LEAF2A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MH-LEAF2A.cfg
index 97221c63fc5..22781b52b5b 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MH-LEAF2A.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MH-LEAF2A.cfg
@@ -139,8 +139,8 @@ ip prefix-list PL-STATIC-VRF-DEFAULT
 ip prefix-list PL-SVI-VRF-DEFAULT
    seq 10 permit 10.2.10.0/24
 !
-ip route vrf MGMT 0.0.0.0/0 192.168.200.5
 ip route 10.0.0.0/8 10.2.10.100
+ip route vrf MGMT 0.0.0.0/0 192.168.200.5
 !
 ntp local-interface vrf MGMT Management1
 ntp server vrf MGMT 192.168.200.5 prefer
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge.cfg
index 50f5f578fb7..52331356039 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge.cfg
@@ -530,12 +530,12 @@ ip prefix-list PL-LOOPBACKS-EVPN-OVERLAY
 ip prefix-list PL-STATIC-VRF-DEFAULT
    seq 10 permit 66.66.66.0/24
 !
-ip route 172.16.0.0/16 172.16.5.4
-ip route 172.16.0.0/16 172.16.5.9
-ip route 66.66.66.0/24 172.17.0.0
 ip route 10.37.121.1/32 172.20.20.21 name IE-ZSCALER-PRI
 ip route 10.39.77.1/32 172.20.20.21 name IE-ZSCALER-SEC
 ip route 10.50.9.1/32 172.20.20.21 name IE-ZSCALER-TER
+ip route 172.16.0.0/16 172.16.5.4
+ip route 172.16.0.0/16 172.16.5.9
+ip route 66.66.66.0/24 172.17.0.0
 !
 ip nat pool PORT-ONLY-POOL port-only
    port range 1500 65535
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-l2-leaf1.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-l2-leaf1.cfg
index b4d91ad0b75..c72e68c60c4 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-l2-leaf1.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-l2-leaf1.cfg
@@ -67,7 +67,7 @@ interface Vlan4092
    ip address 10.254.254.4/24
 no ip routing vrf MGMT
 !
-ip route vrf MGMT 0.0.0.0/0 192.168.0.1
 ip route 0.0.0.0/0 10.254.254.1
+ip route vrf MGMT 0.0.0.0/0 192.168.0.1
 !
 end
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-l2-leaf2.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-l2-leaf2.cfg
index 9d77c801727..360d3a2930e 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-l2-leaf2.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/flow-tracking-tests-l2-leaf2.cfg
@@ -67,7 +67,7 @@ interface Vlan4092
    ip address 10.254.254.5/24
 no ip routing vrf MGMT
 !
-ip route vrf MGMT 0.0.0.0/0 192.168.0.1
 ip route 0.0.0.0/0 10.254.254.1
+ip route vrf MGMT 0.0.0.0/0 192.168.0.1
 !
 end
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/sflow-tests-l2-leaf1.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/sflow-tests-l2-leaf1.cfg
index 754634fcf86..b5c51b22df9 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/sflow-tests-l2-leaf1.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/sflow-tests-l2-leaf1.cfg
@@ -64,7 +64,7 @@ interface Vlan4092
    ip address 10.254.254.4/24
 no ip routing vrf MGMT
 !
-ip route vrf MGMT 0.0.0.0/0 192.168.0.1
 ip route 0.0.0.0/0 10.254.254.1
+ip route vrf MGMT 0.0.0.0/0 192.168.0.1
 !
 end
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/sflow-tests-l2-leaf2.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/sflow-tests-l2-leaf2.cfg
index c1ec1ed822d..82db2c4fb18 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/sflow-tests-l2-leaf2.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/sflow-tests-l2-leaf2.cfg
@@ -64,7 +64,7 @@ interface Vlan4092
    ip address 10.254.254.5/24
 no ip routing vrf MGMT
 !
-ip route vrf MGMT 0.0.0.0/0 192.168.0.1
 ip route 0.0.0.0/0 10.254.254.1
+ip route vrf MGMT 0.0.0.0/0 192.168.0.1
 !
 end
diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-BL1A.md b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-BL1A.md
index 7a4da0d6bb4..86a8f3cbf90 100644
--- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-BL1A.md
+++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-BL1A.md
@@ -592,9 +592,9 @@ ip routing vrf Tenant_L3_VRF_Zone
 ```eos
 !
 ip route vrf MGMT 0.0.0.0/0 192.168.200.5
-ip route vrf Tenant_A_WAN_Zone 10.3.4.0/24 1.2.3.4
 ip route vrf Tenant_A_WAN_Zone 1.1.1.0/24 Vlan101 10.1.1.1
 ip route vrf Tenant_A_WAN_Zone 1.1.2.0/24 Vlan101 10.1.1.1 200 tag 666 name RT-TO-FAKE-DMZ
+ip route vrf Tenant_A_WAN_Zone 10.3.4.0/24 1.2.3.4
 ip route vrf Tenant_A_WAN_Zone 10.3.5.0/24 Null0
 ```
 
diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-BL1B.md b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-BL1B.md
index da9243d53ae..23949587c2e 100644
--- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-BL1B.md
+++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-BL1B.md
@@ -590,9 +590,9 @@ ip routing vrf Tenant_L3_VRF_Zone
 ```eos
 !
 ip route vrf MGMT 0.0.0.0/0 192.168.200.5
-ip route vrf Tenant_A_WAN_Zone 10.3.4.0/24 1.2.3.4
 ip route vrf Tenant_A_WAN_Zone 1.1.1.0/24 Vlan101 10.1.1.1
 ip route vrf Tenant_A_WAN_Zone 1.1.2.0/24 Vlan101 10.1.1.1 200 tag 666 name RT-TO-FAKE-DMZ
+ip route vrf Tenant_A_WAN_Zone 10.3.4.0/24 1.2.3.4
 ip route vrf Tenant_A_WAN_Zone 10.3.5.0/24 Null0
 ```
 
diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-BL1A.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-BL1A.cfg
index 9127e91173a..5a5351b853b 100644
--- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-BL1A.cfg
+++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-BL1A.cfg
@@ -214,9 +214,9 @@ ip prefix-list PL-LOOPBACKS-EVPN-OVERLAY
    seq 20 permit 192.168.254.0/24 eq 32
 !
 ip route vrf MGMT 0.0.0.0/0 192.168.200.5
-ip route vrf Tenant_A_WAN_Zone 10.3.4.0/24 1.2.3.4
 ip route vrf Tenant_A_WAN_Zone 1.1.1.0/24 Vlan101 10.1.1.1
 ip route vrf Tenant_A_WAN_Zone 1.1.2.0/24 Vlan101 10.1.1.1 200 tag 666 name RT-TO-FAKE-DMZ
+ip route vrf Tenant_A_WAN_Zone 10.3.4.0/24 1.2.3.4
 ip route vrf Tenant_A_WAN_Zone 10.3.5.0/24 Null0
 !
 route-map RM-CONN-2-BGP permit 10
diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-BL1B.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-BL1B.cfg
index 62642f6331f..ff023d7cfb8 100644
--- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-BL1B.cfg
+++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-BL1B.cfg
@@ -213,9 +213,9 @@ ip prefix-list PL-LOOPBACKS-EVPN-OVERLAY
    seq 20 permit 192.168.254.0/24 eq 32
 !
 ip route vrf MGMT 0.0.0.0/0 192.168.200.5
-ip route vrf Tenant_A_WAN_Zone 10.3.4.0/24 1.2.3.4
 ip route vrf Tenant_A_WAN_Zone 1.1.1.0/24 Vlan101 10.1.1.1
 ip route vrf Tenant_A_WAN_Zone 1.1.2.0/24 Vlan101 10.1.1.1 200 tag 666 name RT-TO-FAKE-DMZ
+ip route vrf Tenant_A_WAN_Zone 10.3.4.0/24 1.2.3.4
 ip route vrf Tenant_A_WAN_Zone 10.3.5.0/24 Null0
 !
 route-map RM-CONN-2-BGP permit 10
diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/static-routes.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/static-routes.j2
index e5b392c64a3..a0f01d15bb0 100644
--- a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/static-routes.j2
+++ b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/static-routes.j2
@@ -6,7 +6,13 @@
 {# eos - static routes #}
 {% if static_routes is arista.avd.defined %}
 !
-{%     for static_route in static_routes %}
+{%     if static_routes is arista.avd.defined %}
+{%         set with_vrf_non_default = static_routes | selectattr('vrf', 'arista.avd.defined') | rejectattr('vrf', 'equalto', 'default') | arista.avd.natural_sort | arista.avd.natural_sort('vrf') %}
+{%         set without_vrf = static_routes | rejectattr('vrf', 'arista.avd.defined') | arista.avd.natural_sort %}
+{%         set with_vrf_default = static_routes | selectattr('vrf', 'arista.avd.defined') | selectattr('vrf', 'equalto', 'default') | arista.avd.natural_sort %}
+{%         set sorted_static_routes =  without_vrf | list + with_vrf_default | list + with_vrf_non_default | list %}
+{%     endif %}
+{%     for static_route in sorted_static_routes | arista.avd.default([]) %}
 {%         set static_route_cli = "ip route" %}
 {%         if static_route.vrf is arista.avd.defined and static_route.vrf != 'default' %}
 {%             set static_route_cli = static_route_cli ~ " vrf " ~ static_route.vrf %}
diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/system.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/system.j2
index bcdd11a9044..913ebf3c154 100644
--- a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/system.j2
+++ b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/system.j2
@@ -19,7 +19,13 @@ system control-plane
    {{ cp_mss_cli }}
 {%     endif %}
 {#     control_plane access_groups ipv4 #}
-{%     for acl_set in system.control_plane.ipv4_access_groups | arista.avd.natural_sort %}
+{%     if system.control_plane.ipv4_access_groups is arista.avd.defined %}
+{%         set with_vrf_non_default = system.control_plane.ipv4_access_groups | selectattr('vrf', 'arista.avd.defined') | rejectattr('vrf', 'equalto', 'default') | arista.avd.natural_sort | arista.avd.natural_sort('vrf') %}
+{%         set without_vrf = system.control_plane.ipv4_access_groups | rejectattr('vrf', 'arista.avd.defined') | arista.avd.natural_sort %}
+{%         set with_vrf_default = system.control_plane.ipv4_access_groups | selectattr('vrf', 'arista.avd.defined') | selectattr('vrf', 'equalto', 'default') | arista.avd.natural_sort %}
+{%         set sorted_ipv4_access_groups =  without_vrf | list + with_vrf_default | list + with_vrf_non_default | list %}
+{%     endif %}
+{%     for acl_set in sorted_ipv4_access_groups | arista.avd.default([]) %}
 {%         set cp_ipv4_access_grp = "ip access-group " ~ acl_set.acl_name %}
 {%         if acl_set.vrf is arista.avd.defined %}
 {%             set cp_ipv4_access_grp = cp_ipv4_access_grp ~ " vrf " ~ acl_set.vrf %}
@@ -28,7 +34,13 @@ system control-plane
    {{ cp_ipv4_access_grp }}
 {%     endfor %}
 {#     control_plane access_groups ipv6 #}
-{%     for acl_set in system.control_plane.ipv6_access_groups | arista.avd.natural_sort %}
+{%     if system.control_plane.ipv6_access_groups is arista.avd.defined %}
+{%         set with_vrf_non_default = system.control_plane.ipv6_access_groups | selectattr('vrf', 'arista.avd.defined') | rejectattr('vrf', 'equalto', 'default') | arista.avd.natural_sort | arista.avd.natural_sort('vrf') %}
+{%         set without_vrf = system.control_plane.ipv6_access_groups | rejectattr('vrf', 'arista.avd.defined') | arista.avd.natural_sort %}
+{%         set with_vrf_default = system.control_plane.ipv6_access_groups | selectattr('vrf', 'arista.avd.defined') | selectattr('vrf', 'equalto', 'default') | arista.avd.natural_sort %}
+{%         set sorted_ipv6_access_groups =  without_vrf | list + with_vrf_default | list + with_vrf_non_default | list %}
+{%     endif %}
+{%     for acl_set in sorted_ipv6_access_groups | arista.avd.default([]) %}
 {%         set cp_ipv6_access_grp = "ipv6 access-group " ~ acl_set.acl_name %}
 {%         if acl_set.vrf is arista.avd.defined %}
 {%             set cp_ipv6_access_grp = cp_ipv6_access_grp ~ " vrf " ~ acl_set.vrf %}
diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/traffic-policies.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/traffic-policies.j2
index 534c8f93237..06a621ed96a 100644
--- a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/traffic-policies.j2
+++ b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/traffic-policies.j2
@@ -132,16 +132,16 @@ traffic-policies
 {%                         endif %}
 {%                     endfor %}
 {%                 endif %}
-{#                 -- TTL MANAGEMENT -- #}
-{%                 if match.ttl is arista.avd.defined %}
-         ttl {{ match.ttl }}
-{%                 endif %}
 {#                 -- FRAGMENT MANAGEMENT -- #}
 {%                 if match.fragment.offset is arista.avd.defined %}
          fragment offset {{ match.fragment.offset }}
 {%                 elif match.fragment is defined %}
          fragment
 {%                 endif %}
+{#                 -- TTL MANAGEMENT -- #}
+{%                 if match.ttl is arista.avd.defined %}
+         ttl {{ match.ttl }}
+{%                 endif %}
 {#       -- ACTIONS SECTION -- #}
 {%                 if match.actions.count is arista.avd.defined or match.actions.traffic_class is arista.avd.defined or match.actions.dscp is arista.avd.defined or match.actions.drop is arista.avd.defined(true)  %}
          !