diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/tap-aggregation.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/tap-aggregation.md
index 66b32540e41..9b5ec2d0e82 100644
--- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/tap-aggregation.md
+++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/tap-aggregation.md
@@ -60,12 +60,12 @@ interface Management1
 !
 tap aggregation
    mode exclusive profile tap-aggregation-extended
+   encapsulation dot1br strip
+   encapsulation vn-tag strip
    protocol lldp trap
    mode exclusive no-errdisable Ethernet1/1
    mode exclusive no-errdisable Ethetnet 42/1
    mode exclusive no-errdisable Port-Channel200
-   encapsulation dot1br strip
-   encapsulation vn-tag strip
    truncation size 169
    mac timestamp header format 64-bit
    mac timestamp header eth-type 5
diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/tap-aggregation.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/tap-aggregation.cfg
index f583b098efb..64c5310b751 100644
--- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/tap-aggregation.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/tap-aggregation.cfg
@@ -1,12 +1,12 @@
 !
 tap aggregation
    mode exclusive profile tap-aggregation-extended
+   encapsulation dot1br strip
+   encapsulation vn-tag strip
    protocol lldp trap
    mode exclusive no-errdisable Ethernet1/1
    mode exclusive no-errdisable Ethetnet 42/1
    mode exclusive no-errdisable Port-Channel200
-   encapsulation dot1br strip
-   encapsulation vn-tag strip
    truncation size 169
    mac timestamp header format 64-bit
    mac timestamp header eth-type 5
diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/tap-aggregation.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/tap-aggregation.j2
index fa310728c1f..1a590747bda 100644
--- a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/tap-aggregation.j2
+++ b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/tap-aggregation.j2
@@ -15,6 +15,12 @@ tap aggregation
 {%             endif %}
    {{ mode_cli }}
 {%         endif %}
+{%     if tap_aggregation.encapsulation_dot1br_strip is arista.avd.defined(true) %}
+   encapsulation dot1br strip
+{%     endif %}
+{%     if tap_aggregation.encapsulation_vn_tag_strip is arista.avd.defined(true) %}
+   encapsulation vn-tag strip
+{%     endif %}
 {%     if tap_aggregation.protocol_lldp_trap is arista.avd.defined(true) %}
    protocol lldp trap
 {%     endif %}
@@ -22,12 +28,6 @@ tap aggregation
    mode exclusive no-errdisable {{ interface }}
 {%         endfor %}
 {%     endif %}
-{%     if tap_aggregation.encapsulation_dot1br_strip is arista.avd.defined(true) %}
-   encapsulation dot1br strip
-{%     endif %}
-{%     if tap_aggregation.encapsulation_vn_tag_strip is arista.avd.defined(true) %}
-   encapsulation vn-tag strip
-{%     endif %}
 {%     if tap_aggregation.truncation_size is arista.avd.defined %}
    truncation size {{ tap_aggregation.truncation_size }}
 {%     endif %}