diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-l2leaf3.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-leaf3.cfg
similarity index 98%
rename from ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-l2leaf3.cfg
rename to ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-leaf3.cfg
index b84eac54461..8ab742c6d19 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-l2leaf3.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-leaf3.cfg
@@ -8,7 +8,7 @@ transceiver qsfp default-mode 4x10G
 !
 service routing protocols model multi-agent
 !
-hostname ptp-tests-l2leaf3
+hostname ptp-tests-leaf3
 !
 ptp clock-identity 00:1C:73:1e:00:01
 ptp domain 127
@@ -73,7 +73,7 @@ interface Vlan11
    vrf VRF1
 !
 interface Vxlan1
-   description ptp-tests-l2leaf3_VTEP
+   description ptp-tests-leaf3_VTEP
    vxlan source-interface Loopback1
    vxlan udp-port 4789
    vxlan vlan 11 vni 10011
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-l2leaf4.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-leaf4.cfg
similarity index 98%
rename from ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-l2leaf4.cfg
rename to ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-leaf4.cfg
index 1dbebe1bbc1..d2cd92f2c84 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-l2leaf4.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-leaf4.cfg
@@ -8,7 +8,7 @@ transceiver qsfp default-mode 4x10G
 !
 service routing protocols model multi-agent
 !
-hostname ptp-tests-l2leaf4
+hostname ptp-tests-leaf4
 !
 ptp clock-identity 00:1C:73:1e:00:02
 ptp domain 127
@@ -79,7 +79,7 @@ interface Vlan11
    vrf VRF1
 !
 interface Vxlan1
-   description ptp-tests-l2leaf4_VTEP
+   description ptp-tests-leaf4_VTEP
    vxlan source-interface Loopback1
    vxlan udp-port 4789
    vxlan vlan 11 vni 10011
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-l2leaf5.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-leaf5.cfg
similarity index 98%
rename from ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-l2leaf5.cfg
rename to ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-leaf5.cfg
index a1f54f9d1ee..d96d76484cc 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-l2leaf5.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-leaf5.cfg
@@ -8,7 +8,7 @@ transceiver qsfp default-mode 4x10G
 !
 service routing protocols model multi-agent
 !
-hostname ptp-tests-l2leaf5
+hostname ptp-tests-leaf5
 !
 ptp clock-identity 00:1C:73:1e:00:03
 ptp domain 127
@@ -79,7 +79,7 @@ interface Vlan11
    vrf VRF1
 !
 interface Vxlan1
-   description ptp-tests-l2leaf5_VTEP
+   description ptp-tests-leaf5_VTEP
    vxlan source-interface Loopback1
    vxlan udp-port 4789
    vxlan vlan 11 vni 10011
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-spine1.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-spine1.cfg
index dfa31c934f3..e6bb84a7dd5 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-spine1.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-spine1.cfg
@@ -136,7 +136,7 @@ interface Ethernet9
    ptp transport ipv4
 !
 interface Ethernet15
-   description P2P_ptp-tests-l2leaf3_Ethernet1
+   description P2P_ptp-tests-leaf3_Ethernet1
    no shutdown
    mtu 9214
    no switchport
@@ -149,7 +149,7 @@ interface Ethernet15
    ptp transport ipv4
 !
 interface Ethernet16
-   description P2P_ptp-tests-l2leaf4_Ethernet1
+   description P2P_ptp-tests-leaf4_Ethernet1
    no shutdown
    mtu 9214
    no switchport
@@ -162,7 +162,7 @@ interface Ethernet16
    ptp transport ipv4
 !
 interface Ethernet17
-   description P2P_ptp-tests-l2leaf5_Ethernet1
+   description P2P_ptp-tests-leaf5_Ethernet1
    no shutdown
    mtu 9214
    no switchport
@@ -234,22 +234,22 @@ router bgp 65200
    neighbor 10.254.2.7 description ptp-tests-leaf2_Ethernet2
    neighbor 192.168.1.1 peer group IPv4-UNDERLAY-PEERS
    neighbor 192.168.1.1 remote-as 65010
-   neighbor 192.168.1.1 description ptp-tests-l2leaf3_Ethernet1
+   neighbor 192.168.1.1 description ptp-tests-leaf3_Ethernet1
    neighbor 192.168.1.5 peer group IPv4-UNDERLAY-PEERS
    neighbor 192.168.1.5 remote-as 65010
-   neighbor 192.168.1.5 description ptp-tests-l2leaf4_Ethernet1
+   neighbor 192.168.1.5 description ptp-tests-leaf4_Ethernet1
    neighbor 192.168.1.9 peer group IPv4-UNDERLAY-PEERS
    neighbor 192.168.1.9 remote-as 65010
-   neighbor 192.168.1.9 description ptp-tests-l2leaf5_Ethernet1
+   neighbor 192.168.1.9 description ptp-tests-leaf5_Ethernet1
    neighbor 192.168.3.1 peer group EVPN-OVERLAY-PEERS
    neighbor 192.168.3.1 remote-as 65010
-   neighbor 192.168.3.1 description ptp-tests-l2leaf3_Loopback0
+   neighbor 192.168.3.1 description ptp-tests-leaf3_Loopback0
    neighbor 192.168.3.2 peer group EVPN-OVERLAY-PEERS
    neighbor 192.168.3.2 remote-as 65010
-   neighbor 192.168.3.2 description ptp-tests-l2leaf4_Loopback0
+   neighbor 192.168.3.2 description ptp-tests-leaf4_Loopback0
    neighbor 192.168.3.3 peer group EVPN-OVERLAY-PEERS
    neighbor 192.168.3.3 remote-as 65010
-   neighbor 192.168.3.3 description ptp-tests-l2leaf5_Loopback0
+   neighbor 192.168.3.3 description ptp-tests-leaf5_Loopback0
    redistribute connected route-map RM-CONN-2-BGP
    !
    address-family evpn
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-spine2.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-spine2.cfg
index 34fb0437548..e645b15ffcc 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-spine2.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ptp-tests-spine2.cfg
@@ -91,14 +91,14 @@ interface Ethernet9
    ptp transport ipv4
 !
 interface Ethernet15
-   description P2P_ptp-tests-l2leaf3_Ethernet2
+   description P2P_ptp-tests-leaf3_Ethernet2
    no shutdown
    mtu 9214
    no switchport
    ip address 192.168.1.2/31
 !
 interface Ethernet16
-   description P2P_ptp-tests-l2leaf4_Ethernet2
+   description P2P_ptp-tests-leaf4_Ethernet2
    no shutdown
    mtu 9214
    no switchport
@@ -111,7 +111,7 @@ interface Ethernet16
    ptp transport ipv4
 !
 interface Ethernet17
-   description P2P_ptp-tests-l2leaf5_Ethernet2
+   description P2P_ptp-tests-leaf5_Ethernet2
    no shutdown
    mtu 9214
    no switchport
@@ -165,22 +165,22 @@ router bgp 65200
    neighbor IPv4-UNDERLAY-PEERS maximum-routes 12000
    neighbor 192.168.1.3 peer group IPv4-UNDERLAY-PEERS
    neighbor 192.168.1.3 remote-as 65010
-   neighbor 192.168.1.3 description ptp-tests-l2leaf3_Ethernet2
+   neighbor 192.168.1.3 description ptp-tests-leaf3_Ethernet2
    neighbor 192.168.1.7 peer group IPv4-UNDERLAY-PEERS
    neighbor 192.168.1.7 remote-as 65010
-   neighbor 192.168.1.7 description ptp-tests-l2leaf4_Ethernet2
+   neighbor 192.168.1.7 description ptp-tests-leaf4_Ethernet2
    neighbor 192.168.1.11 peer group IPv4-UNDERLAY-PEERS
    neighbor 192.168.1.11 remote-as 65010
-   neighbor 192.168.1.11 description ptp-tests-l2leaf5_Ethernet2
+   neighbor 192.168.1.11 description ptp-tests-leaf5_Ethernet2
    neighbor 192.168.3.1 peer group EVPN-OVERLAY-PEERS
    neighbor 192.168.3.1 remote-as 65010
-   neighbor 192.168.3.1 description ptp-tests-l2leaf3_Loopback0
+   neighbor 192.168.3.1 description ptp-tests-leaf3_Loopback0
    neighbor 192.168.3.2 peer group EVPN-OVERLAY-PEERS
    neighbor 192.168.3.2 remote-as 65010
-   neighbor 192.168.3.2 description ptp-tests-l2leaf4_Loopback0
+   neighbor 192.168.3.2 description ptp-tests-leaf4_Loopback0
    neighbor 192.168.3.3 peer group EVPN-OVERLAY-PEERS
    neighbor 192.168.3.3 remote-as 65010
-   neighbor 192.168.3.3 description ptp-tests-l2leaf5_Loopback0
+   neighbor 192.168.3.3 description ptp-tests-leaf5_Loopback0
    redistribute connected route-map RM-CONN-2-BGP
    !
    address-family evpn
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-l2leaf3.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-leaf3.yml
similarity index 98%
rename from ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-l2leaf3.yml
rename to ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-leaf3.yml
index 6bd163d0781..bb7553db484 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-l2leaf3.yml
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-leaf3.yml
@@ -33,7 +33,7 @@ ethernet_interfaces:
   peer_type: spine
   switchport:
     enabled: false
-hostname: ptp-tests-l2leaf3
+hostname: ptp-tests-leaf3
 ip_igmp_snooping:
   globally_enabled: true
 ip_routing: true
@@ -200,7 +200,7 @@ vrfs:
   tenant: PTP
 vxlan_interface:
   vxlan1:
-    description: ptp-tests-l2leaf3_VTEP
+    description: ptp-tests-leaf3_VTEP
     vxlan:
       source_interface: Loopback1
       udp_port: 4789
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-l2leaf4.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-leaf4.yml
similarity index 98%
rename from ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-l2leaf4.yml
rename to ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-leaf4.yml
index f84606c687e..5176e4c2a14 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-l2leaf4.yml
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-leaf4.yml
@@ -42,7 +42,7 @@ ethernet_interfaces:
   peer_type: spine
   switchport:
     enabled: false
-hostname: ptp-tests-l2leaf4
+hostname: ptp-tests-leaf4
 ip_igmp_snooping:
   globally_enabled: true
 ip_routing: true
@@ -209,7 +209,7 @@ vrfs:
   tenant: PTP
 vxlan_interface:
   vxlan1:
-    description: ptp-tests-l2leaf4_VTEP
+    description: ptp-tests-leaf4_VTEP
     vxlan:
       source_interface: Loopback1
       udp_port: 4789
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-l2leaf5.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-leaf5.yml
similarity index 98%
rename from ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-l2leaf5.yml
rename to ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-leaf5.yml
index b8798edb984..b88eac7eff5 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-l2leaf5.yml
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-leaf5.yml
@@ -42,7 +42,7 @@ ethernet_interfaces:
   peer_type: spine
   switchport:
     enabled: false
-hostname: ptp-tests-l2leaf5
+hostname: ptp-tests-leaf5
 ip_igmp_snooping:
   globally_enabled: true
 ip_routing: true
@@ -209,7 +209,7 @@ vrfs:
   tenant: PTP
 vxlan_interface:
   vxlan1:
-    description: ptp-tests-l2leaf5_VTEP
+    description: ptp-tests-leaf5_VTEP
     vxlan:
       source_interface: Loopback1
       udp_port: 4789
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-spine1.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-spine1.yml
index 2ddd4a2d449..ed8d280e5b7 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-spine1.yml
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-spine1.yml
@@ -81,7 +81,7 @@ ethernet_interfaces:
   switchport:
     enabled: false
 - name: Ethernet15
-  description: P2P_ptp-tests-l2leaf3_Ethernet1
+  description: P2P_ptp-tests-leaf3_Ethernet1
   shutdown: false
   mtu: 9214
   ip_address: 192.168.1.0/31
@@ -94,13 +94,13 @@ ethernet_interfaces:
     sync_message:
       interval: -3
     transport: ipv4
-  peer: ptp-tests-l2leaf3
+  peer: ptp-tests-leaf3
   peer_interface: Ethernet1
   peer_type: l3leaf
   switchport:
     enabled: false
 - name: Ethernet16
-  description: P2P_ptp-tests-l2leaf4_Ethernet1
+  description: P2P_ptp-tests-leaf4_Ethernet1
   shutdown: false
   mtu: 9214
   ip_address: 192.168.1.4/31
@@ -113,13 +113,13 @@ ethernet_interfaces:
     sync_message:
       interval: -3
     transport: ipv4
-  peer: ptp-tests-l2leaf4
+  peer: ptp-tests-leaf4
   peer_interface: Ethernet1
   peer_type: l3leaf
   switchport:
     enabled: false
 - name: Ethernet17
-  description: P2P_ptp-tests-l2leaf5_Ethernet1
+  description: P2P_ptp-tests-leaf5_Ethernet1
   shutdown: false
   mtu: 9214
   ip_address: 192.168.1.8/31
@@ -132,7 +132,7 @@ ethernet_interfaces:
     sync_message:
       interval: -3
     transport: ipv4
-  peer: ptp-tests-l2leaf5
+  peer: ptp-tests-leaf5
   peer_interface: Ethernet1
   peer_type: l3leaf
   switchport:
@@ -317,33 +317,18 @@ router_bgp:
   - ip_address: 192.168.1.1
     peer_group: IPv4-UNDERLAY-PEERS
     remote_as: '65010'
-    peer: ptp-tests-l2leaf3
-    description: ptp-tests-l2leaf3_Ethernet1
+    peer: ptp-tests-leaf3
+    description: ptp-tests-leaf3_Ethernet1
   - ip_address: 192.168.1.5
     peer_group: IPv4-UNDERLAY-PEERS
     remote_as: '65010'
-    peer: ptp-tests-l2leaf4
-    description: ptp-tests-l2leaf4_Ethernet1
+    peer: ptp-tests-leaf4
+    description: ptp-tests-leaf4_Ethernet1
   - ip_address: 192.168.1.9
     peer_group: IPv4-UNDERLAY-PEERS
     remote_as: '65010'
-    peer: ptp-tests-l2leaf5
-    description: ptp-tests-l2leaf5_Ethernet1
-  - ip_address: 192.168.3.1
-    peer_group: EVPN-OVERLAY-PEERS
-    remote_as: '65010'
-    peer: ptp-tests-l2leaf3
-    description: ptp-tests-l2leaf3_Loopback0
-  - ip_address: 192.168.3.2
-    peer_group: EVPN-OVERLAY-PEERS
-    remote_as: '65010'
-    peer: ptp-tests-l2leaf4
-    description: ptp-tests-l2leaf4_Loopback0
-  - ip_address: 192.168.3.3
-    peer_group: EVPN-OVERLAY-PEERS
-    remote_as: '65010'
-    peer: ptp-tests-l2leaf5
-    description: ptp-tests-l2leaf5_Loopback0
+    peer: ptp-tests-leaf5
+    description: ptp-tests-leaf5_Ethernet1
   - ip_address: 10.254.1.1
     peer_group: EVPN-OVERLAY-PEERS
     remote_as: '65101'
@@ -354,6 +339,21 @@ router_bgp:
     remote_as: '65102'
     peer: ptp-tests-leaf2
     description: ptp-tests-leaf2_Loopback0
+  - ip_address: 192.168.3.1
+    peer_group: EVPN-OVERLAY-PEERS
+    remote_as: '65010'
+    peer: ptp-tests-leaf3
+    description: ptp-tests-leaf3_Loopback0
+  - ip_address: 192.168.3.2
+    peer_group: EVPN-OVERLAY-PEERS
+    remote_as: '65010'
+    peer: ptp-tests-leaf4
+    description: ptp-tests-leaf4_Loopback0
+  - ip_address: 192.168.3.3
+    peer_group: EVPN-OVERLAY-PEERS
+    remote_as: '65010'
+    peer: ptp-tests-leaf5
+    description: ptp-tests-leaf5_Loopback0
   redistribute:
     connected:
       enabled: true
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-spine2.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-spine2.yml
index 6e451a35ff3..42c6e66f818 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-spine2.yml
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/ptp-tests-spine2.yml
@@ -5,17 +5,17 @@ enable_password:
   disabled: true
 ethernet_interfaces:
 - name: Ethernet15
-  description: P2P_ptp-tests-l2leaf3_Ethernet2
+  description: P2P_ptp-tests-leaf3_Ethernet2
   shutdown: false
   mtu: 9214
   ip_address: 192.168.1.2/31
-  peer: ptp-tests-l2leaf3
+  peer: ptp-tests-leaf3
   peer_interface: Ethernet2
   peer_type: l3leaf
   switchport:
     enabled: false
 - name: Ethernet16
-  description: P2P_ptp-tests-l2leaf4_Ethernet2
+  description: P2P_ptp-tests-leaf4_Ethernet2
   shutdown: false
   mtu: 9214
   ip_address: 192.168.1.6/31
@@ -28,13 +28,13 @@ ethernet_interfaces:
     sync_message:
       interval: -3
     transport: ipv4
-  peer: ptp-tests-l2leaf4
+  peer: ptp-tests-leaf4
   peer_interface: Ethernet2
   peer_type: l3leaf
   switchport:
     enabled: false
 - name: Ethernet17
-  description: P2P_ptp-tests-l2leaf5_Ethernet2
+  description: P2P_ptp-tests-leaf5_Ethernet2
   shutdown: false
   mtu: 9214
   ip_address: 192.168.1.10/31
@@ -47,7 +47,7 @@ ethernet_interfaces:
     sync_message:
       interval: -3
     transport: ipv4
-  peer: ptp-tests-l2leaf5
+  peer: ptp-tests-leaf5
   peer_interface: Ethernet2
   peer_type: l3leaf
   switchport:
@@ -224,33 +224,33 @@ router_bgp:
   - ip_address: 192.168.1.3
     peer_group: IPv4-UNDERLAY-PEERS
     remote_as: '65010'
-    peer: ptp-tests-l2leaf3
-    description: ptp-tests-l2leaf3_Ethernet2
+    peer: ptp-tests-leaf3
+    description: ptp-tests-leaf3_Ethernet2
   - ip_address: 192.168.1.7
     peer_group: IPv4-UNDERLAY-PEERS
     remote_as: '65010'
-    peer: ptp-tests-l2leaf4
-    description: ptp-tests-l2leaf4_Ethernet2
+    peer: ptp-tests-leaf4
+    description: ptp-tests-leaf4_Ethernet2
   - ip_address: 192.168.1.11
     peer_group: IPv4-UNDERLAY-PEERS
     remote_as: '65010'
-    peer: ptp-tests-l2leaf5
-    description: ptp-tests-l2leaf5_Ethernet2
+    peer: ptp-tests-leaf5
+    description: ptp-tests-leaf5_Ethernet2
   - ip_address: 192.168.3.1
     peer_group: EVPN-OVERLAY-PEERS
     remote_as: '65010'
-    peer: ptp-tests-l2leaf3
-    description: ptp-tests-l2leaf3_Loopback0
+    peer: ptp-tests-leaf3
+    description: ptp-tests-leaf3_Loopback0
   - ip_address: 192.168.3.2
     peer_group: EVPN-OVERLAY-PEERS
     remote_as: '65010'
-    peer: ptp-tests-l2leaf4
-    description: ptp-tests-l2leaf4_Loopback0
+    peer: ptp-tests-leaf4
+    description: ptp-tests-leaf4_Loopback0
   - ip_address: 192.168.3.3
     peer_group: EVPN-OVERLAY-PEERS
     remote_as: '65010'
-    peer: ptp-tests-l2leaf5
-    description: ptp-tests-l2leaf5_Loopback0
+    peer: ptp-tests-leaf5
+    description: ptp-tests-leaf5_Loopback0
   redistribute:
     connected:
       enabled: true
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/group_vars/PTP_TESTS_UPLINKS.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/group_vars/PTP_TESTS_UPLINKS.yml
index ba277c82247..9b8c764f389 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/group_vars/PTP_TESTS_UPLINKS.yml
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/group_vars/PTP_TESTS_UPLINKS.yml
@@ -7,21 +7,23 @@ l3leaf:
     uplink_ipv4_pool: 192.168.1.0/24
     vtep_loopback_ipv4_pool: 192.168.2.0/24
     loopback_ipv4_pool: 192.168.3.0/24
-    uplink_ptp:
-      enable: true
   nodes:
-    - name: ptp-tests-l2leaf3
+    - name: ptp-tests-leaf3
       id: 1
       uplink_switch_interfaces: [Ethernet15, Ethernet15]
       ptp:
+        enabled: true
         # PTP configured on below interfaces.
         uplinks: ['Ethernet1']
-    - name: ptp-tests-l2leaf4
+    - name: ptp-tests-leaf4
       id: 2
       uplink_switch_interfaces: [Ethernet16, Ethernet16]
       ptp:
+        enabled: true
         uplinks: ['Ethernet1', 'Ethernet2']
       # PTP configured on all uplinks when 'ptp.uplinks' is not set.
-    - name: ptp-tests-l2leaf5
+    - name: ptp-tests-leaf5
       id: 3
       uplink_switch_interfaces: [Ethernet17, Ethernet17]
+      ptp:
+        enabled: true
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/hosts.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/hosts.yml
index 95af0c42222..dd347a9704b 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/hosts.yml
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/hosts.yml
@@ -275,9 +275,9 @@ all:
                 ptp-tests-l2leaf2-ptp-enabled-uplink-disabled:
             PTP_TESTS_UPLINKS:
               hosts:
-                ptp-tests-l2leaf3:
-                ptp-tests-l2leaf4:
-                ptp-tests-l2leaf5:
+                ptp-tests-leaf3:
+                ptp-tests-leaf4:
+                ptp-tests-leaf5:
         SFLOW_TESTS:
           children:
             SFLOW_TESTS_SPINES:
diff --git a/python-avd/pyavd/_eos_designs/eos_designs_facts/uplinks.py b/python-avd/pyavd/_eos_designs/eos_designs_facts/uplinks.py
index b71b84997e1..6a79c7d558a 100644
--- a/python-avd/pyavd/_eos_designs/eos_designs_facts/uplinks.py
+++ b/python-avd/pyavd/_eos_designs/eos_designs_facts/uplinks.py
@@ -186,10 +186,9 @@ def _get_p2p_uplink(self: EosDesignsFacts, uplink_index: int, uplink_interface:
         if self.shared_utils.uplink_switch_interface_speed is not None:
             uplink["peer_speed"] = self.shared_utils.uplink_switch_interface_speed
 
-        if self.shared_utils.node_config.uplink_ptp.enable:
-            if not (ptp_uplinks := self.shared_utils.node_config.ptp.uplinks) or (ptp_uplinks and uplink_interface in ptp_uplinks):
-                uplink["ptp"] = {"enable": True}
-        elif self.shared_utils.ptp_enabled:
+        if (uplink_ptp:=self.shared_utils.node_config.uplink_ptp):
+            uplink["ptp"] = uplink_ptp._as_dict()
+        elif self.shared_utils.ptp_enabled and (not (ptp_uplinks := self.shared_utils.ptp_uplinks) or (ptp_uplinks and (uplink_interface in ptp_uplinks))):
             uplink["ptp"] = {"enable": True}
 
         if self.shared_utils.node_config.uplink_macsec.profile: