diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/vlan-interfaces.md b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/vlan-interfaces.md
index 0cc2eb24a24..a4442f9ad79 100644
--- a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/vlan-interfaces.md
+++ b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/vlan-interfaces.md
@@ -165,8 +165,8 @@
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;distance</samp>](## "vlan_interfaces.[].ip_attached_host_route_export.distance") | Integer |  |  | Min: 1<br>Max: 255 |  |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;ipv6_attached_host_route_export</samp>](## "vlan_interfaces.[].ipv6_attached_host_route_export") | Dictionary |  |  |  |  |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;enabled</samp>](## "vlan_interfaces.[].ipv6_attached_host_route_export.enabled") | Boolean | Required |  |  |  |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;distance</samp>](## "vlan_interfaces.[].ipv6_attached_host_route_export.distance") | Integer |  |  | Min: 1<br>Max: 255 |  |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;prefix_length</samp>](## "vlan_interfaces.[].ipv6_attached_host_route_export.prefix_length") | Integer |  |  | Min: 0<br>Max: 128 |  |
+    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;distance</samp>](## "vlan_interfaces.[].ipv6_attached_host_route_export.distance") | Integer |  |  | Min: 1<br>Max: 255 | Administrative distance for generated routes. |
+    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;prefix_length</samp>](## "vlan_interfaces.[].ipv6_attached_host_route_export.prefix_length") | Integer |  |  | Min: 0<br>Max: 128 | Prefix length for generated routes. |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;bfd</samp>](## "vlan_interfaces.[].bfd") | Dictionary |  |  |  |  |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;echo</samp>](## "vlan_interfaces.[].bfd.echo") | Boolean |  |  |  |  |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;interval</samp>](## "vlan_interfaces.[].bfd.interval") | Integer |  |  |  | Rate in milliseconds |
@@ -493,7 +493,11 @@
           distance: <int; 1-255>
         ipv6_attached_host_route_export:
           enabled: <bool; required>
+
+          # Administrative distance for generated routes.
           distance: <int; 1-255>
+
+          # Prefix length for generated routes.
           prefix_length: <int; 0-128>
         bfd:
           echo: <bool>
diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.jsonschema.json b/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.jsonschema.json
index 830b8ac68ff..ccc7fa408eb 100644
--- a/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.jsonschema.json
+++ b/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.jsonschema.json
@@ -25974,12 +25974,14 @@
                 "type": "integer",
                 "minimum": 1,
                 "maximum": 255,
+                "description": "Administrative distance for generated routes.",
                 "title": "Distance"
               },
               "prefix_length": {
                 "type": "integer",
                 "minimum": 0,
                 "maximum": 128,
+                "description": "Prefix length for generated routes.",
                 "title": "Prefix Length"
               }
             },
diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.schema.pickle b/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.schema.pickle
index bd8e34e5c13..9dee11410ca 100644
Binary files a/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.schema.pickle and b/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.schema.pickle differ
diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.schema.yml b/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.schema.yml
index 92ba683fe7d..a1f4aae1a8f 100644
--- a/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.schema.yml
+++ b/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.schema.yml
@@ -15025,12 +15025,14 @@ keys:
               - str
               min: 1
               max: 255
+              description: Administrative distance for generated routes.
             prefix_length:
               type: int
               convert_types:
               - str
               min: 0
               max: 128
+              description: Prefix length for generated routes.
         bfd:
           type: dict
           keys:
diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/schema_fragments/vlan_interfaces.schema.yml b/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/schema_fragments/vlan_interfaces.schema.yml
index 185067695c8..b46b6571c5c 100644
--- a/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/schema_fragments/vlan_interfaces.schema.yml
+++ b/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/schema_fragments/vlan_interfaces.schema.yml
@@ -503,12 +503,14 @@ keys:
                 - str
               min: 1
               max: 255
+              description: Administrative distance for generated routes.
             prefix_length:
               type: int
               convert_types:
                 - str
               min: 0
               max: 128
+              description: Prefix length for generated routes.
         bfd:
           type: dict
           keys:
diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/templates/eos/vlan-interfaces.j2 b/ansible_collections/arista/avd/roles/eos_cli_config_gen/templates/eos/vlan-interfaces.j2
index de3765dd88e..c212884ae4a 100644
--- a/ansible_collections/arista/avd/roles/eos_cli_config_gen/templates/eos/vlan-interfaces.j2
+++ b/ansible_collections/arista/avd/roles/eos_cli_config_gen/templates/eos/vlan-interfaces.j2
@@ -78,6 +78,16 @@ interface {{ vlan_interface.name }}
 {%         endif %}
    {{ destination_cli }}
 {%     endfor %}
+{%     if vlan_interface.ipv6_attached_host_route_export.enabled is arista.avd.defined(true) %}
+{%         set ipv6_attached_host_route_export_cli = "ipv6 attached-host route export" %}
+{%         if vlan_interface.ipv6_attached_host_route_export.distance is arista.avd.defined %}
+{%             set ipv6_attached_host_route_export_cli = ipv6_attached_host_route_export_cli ~ " " ~ vlan_interface.ipv6_attached_host_route_export.distance %}
+{%         endif %}
+{%         if vlan_interface.ipv6_attached_host_route_export.prefix_length is arista.avd.defined %}
+{%             set ipv6_attached_host_route_export_cli = ipv6_attached_host_route_export_cli ~ " prefix-length " ~ vlan_interface.ipv6_attached_host_route_export.prefix_length %}
+{%         endif %}
+   {{ ipv6_attached_host_route_export_cli }}
+{%     endif %}
 {%     if vlan_interface.ip_igmp is arista.avd.defined(true) %}
    ip igmp
 {%     endif %}
@@ -302,16 +312,6 @@ interface {{ vlan_interface.name }}
 {%         endif %}
    {{ ip_attached_host_route_export_cli }}
 {%     endif %}
-{%     if vlan_interface.ipv6_attached_host_route_export.enabled is arista.avd.defined(true) %}
-{%         set ipv6_attached_host_route_export_cli = "ipv6 attached-host route export" %}
-{%         if vlan_interface.ipv6_attached_host_route_export.distance is arista.avd.defined %}
-{%             set ipv6_attached_host_route_export_cli = ipv6_attached_host_route_export_cli ~ " " ~ vlan_interface.ipv6_attached_host_route_export.distance %}
-{%         endif %}
-{%         if vlan_interface.ipv6_attached_host_route_export.prefix_length is arista.avd.defined %}
-{%             set ipv6_attached_host_route_export_cli = ipv6_attached_host_route_export_cli ~ " prefix-length " ~ vlan_interface.ipv6_attached_host_route_export.prefix_length %}
-{%         endif %}
-   {{ ipv6_attached_host_route_export_cli }}
-{%     endif %}
 {%     if vlan_interface.bfd.interval is arista.avd.defined and
           vlan_interface.bfd.min_rx is arista.avd.defined and
           vlan_interface.bfd.multiplier is arista.avd.defined %}
diff --git a/ansible_collections/arista/avd/roles/eos_designs/schemas/eos_designs.jsonschema.json b/ansible_collections/arista/avd/roles/eos_designs/schemas/eos_designs.jsonschema.json
index 862aa91574d..3fad6fb189d 100644
--- a/ansible_collections/arista/avd/roles/eos_designs/schemas/eos_designs.jsonschema.json
+++ b/ansible_collections/arista/avd/roles/eos_designs/schemas/eos_designs.jsonschema.json
@@ -21870,12 +21870,14 @@
                           "type": "integer",
                           "minimum": 1,
                           "maximum": 255,
+                          "description": "Administrative distance for generated routes.",
                           "title": "Distance"
                         },
                         "prefix_length": {
                           "type": "integer",
                           "minimum": 0,
                           "maximum": 128,
+                          "description": "Prefix length for generated routes.",
                           "title": "Prefix Length"
                         }
                       },
@@ -23544,12 +23546,14 @@
                     "type": "integer",
                     "minimum": 1,
                     "maximum": 255,
+                    "description": "Administrative distance for generated routes.",
                     "title": "Distance"
                   },
                   "prefix_length": {
                     "type": "integer",
                     "minimum": 0,
                     "maximum": 128,
+                    "description": "Prefix length for generated routes.",
                     "title": "Prefix Length"
                   }
                 },
diff --git a/ansible_collections/arista/avd/roles/eos_designs/schemas/eos_designs.schema.pickle b/ansible_collections/arista/avd/roles/eos_designs/schemas/eos_designs.schema.pickle
index ab286b167a1..6f9ae9a7c26 100644
Binary files a/ansible_collections/arista/avd/roles/eos_designs/schemas/eos_designs.schema.pickle and b/ansible_collections/arista/avd/roles/eos_designs/schemas/eos_designs.schema.pickle differ