diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/host1.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/host1.md
index 11794a44b31..04a808010cd 100644
--- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/host1.md
+++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/host1.md
@@ -5325,6 +5325,10 @@ policy-map type pbr PM_PBR_BREAKOUT
 
 ### Router BFD
 
+| BFD Tuning |
+| ---------- |
+| Slow-Timer 5000 |
+
 #### Router BFD Singlehop Summary
 
 | Interval | Minimum RX | Multiplier |
@@ -5348,9 +5352,9 @@ policy-map type pbr PM_PBR_BREAKOUT
 ```eos
 !
 router bfd
-   slow-timer 5000
    interval 900 min-rx 900 multiplier 50 default
    multihop interval 300 min-rx 300 multiplier 3
+   slow-timer 5000
    local-address 192.168.255.1
    session stats snapshot interval 51
    !
diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/host1.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/host1.cfg
index c5a63f8568c..b071df96abb 100644
--- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/host1.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/host1.cfg
@@ -3355,9 +3355,9 @@ peer-filter PF2
    30 match as-range 65000 result accept
 !
 router bfd
-   slow-timer 5000
    interval 900 min-rx 900 multiplier 50 default
    multihop interval 300 min-rx 300 multiplier 3
+   slow-timer 5000
    local-address 192.168.255.1
    session stats snapshot interval 51
    !
diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/router-bfd.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/router-bfd.j2
index 862f0eef87a..93ebbf27628 100644
--- a/python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/router-bfd.j2
+++ b/python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/router-bfd.j2
@@ -7,6 +7,14 @@
 {% if router_bfd is arista.avd.defined %}
 
 ### Router BFD
+{%     if router_bfd.slow_timer is arista.avd.defined %}
+
+| BFD Tuning |
+| ---------- |
+{%         if router_bfd.slow_timer is arista.avd.defined %}
+| Slow-Timer {{ router_bfd.slow_timer }} |
+{%         endif %}
+{%     endif %}
 {%     if router_bfd.interval is arista.avd.defined and router_bfd.min_rx is arista.avd.defined and router_bfd.multiplier is arista.avd.defined  %}
 
 #### Router BFD Singlehop Summary
diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/router-bfd.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/router-bfd.j2
index 601c5dcc83f..5a4047fe3f9 100644
--- a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/router-bfd.j2
+++ b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/router-bfd.j2
@@ -7,15 +7,15 @@
 {% if router_bfd is arista.avd.defined %}
 !
 router bfd
-{%     if router_bfd.slow_timer is arista.avd.defined %}
-   slow-timer {{ router_bfd.slow_timer }}
-{%     endif %}
 {%     if router_bfd.interval is arista.avd.defined and router_bfd.min_rx is arista.avd.defined and router_bfd.multiplier is arista.avd.defined %}
    interval {{ router_bfd.interval }} min-rx {{ router_bfd.min_rx }} multiplier {{ router_bfd.multiplier }} default
 {%     endif %}
 {%     if router_bfd.multihop.interval is arista.avd.defined and router_bfd.multihop.min_rx is arista.avd.defined and router_bfd.multihop.multiplier is arista.avd.defined %}
    multihop interval {{ router_bfd.multihop.interval }} min-rx {{ router_bfd.multihop.min_rx }} multiplier {{ router_bfd.multihop.multiplier }}
 {%     endif %}
+{%     if router_bfd.slow_timer is arista.avd.defined %}
+   slow-timer {{ router_bfd.slow_timer }}
+{%     endif %}
 {%     if router_bfd.local_address is arista.avd.defined %}
    local-address {{ router_bfd.local_address }}
 {%     endif %}