diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc1-wan1.yml b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc1-wan1.yml
index 186484fc6e9..b118137a4bd 100644
--- a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc1-wan1.yml
+++ b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc1-wan1.yml
@@ -171,6 +171,7 @@ management_security:
       file: STUN-DTLS.crt
       key: STUN-DTLS.key
 metadata:
+  fabric_name: FABRIC
   cv_tags:
     device_tags:
     - name: Role
@@ -225,7 +226,6 @@ metadata:
       carrier: isp-1
       circuit_id: DC1-INET-3
       pathgroup: internet
-  fabric_name: FABRIC
 prefix_lists:
 - name: PL-LOOPBACKS-EVPN-OVERLAY
   sequence_numbers:
diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc1-wan2.yml b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc1-wan2.yml
index fb3fe3aa529..de9fc30b217 100644
--- a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc1-wan2.yml
+++ b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc1-wan2.yml
@@ -172,6 +172,7 @@ management_security:
       file: STUN-DTLS.crt
       key: STUN-DTLS.key
 metadata:
+  fabric_name: FABRIC
   cv_tags:
     device_tags:
     - name: Role
@@ -226,7 +227,6 @@ metadata:
       carrier: isp-1
       circuit_id: DC1-INET-4
       pathgroup: internet
-  fabric_name: FABRIC
 prefix_lists:
 - name: PL-LOOPBACKS-EVPN-OVERLAY
   sequence_numbers: