diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/config.bcm.j2
similarity index 97%
rename from device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm
rename to device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/config.bcm.j2
index 3b37d661f403..89a55175edc8 100644
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/config.bcm.j2
@@ -1,6 +1,15 @@
+{# Construct config.bcm to include additional soc properties per specific device metadata requirement #}
+{%- set map_prio = '' -%}
+{%- if DEVICE_METADATA is defined and DEVICE_METADATA['localhost'] is defined and DEVICE_METADATA['localhost']['subtype'] is defined -%}
+{%-     set switch_subtype = DEVICE_METADATA['localhost']['subtype'] -%}
+{%-     if 'dualtor' in switch_subtype.lower() %}
+{%-         set map_prio = 'sai_remap_prio_on_tnl_egress=1' -%}
+{%-     endif %}
+{%- endif %}
 sai_load_hw_config=/etc/bcm/flex/bcm56870_a0_premium_issu/b870.6.4.1/
 l3_alpm_hit_skip=1
 sai_adjust_acl_drop_in_rx_drop=1
+{{ map_prio }}
 host_as_route_disable=1
 use_all_splithorizon_groups=1
 riot_enable=1
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/sai.profile b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/sai.profile
index 7d96f190de73..5163d6140f0e 100644
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/sai.profile
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/sai.profile
@@ -1,2 +1,2 @@
-SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td3-a7050cx3-32s-32x100G.config.bcm
+SAI_INIT_CONFIG_FILE=/etc/sai.d/config.bcm
 SAI_NUM_ECMP_MEMBERS=64
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/config.bcm.j2
similarity index 97%
rename from device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm
rename to device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/config.bcm.j2
index 267b3bb81a9a..9f523e506660 100644
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/config.bcm.j2
@@ -1,6 +1,15 @@
+{# Construct config.bcm to include additional soc properties per specific device metadata requirement #}
+{%- set map_prio = '' -%}
+{%- if DEVICE_METADATA is defined and DEVICE_METADATA['localhost'] is defined and DEVICE_METADATA['localhost']['subtype'] is defined -%}
+{%-     set switch_subtype = DEVICE_METADATA['localhost']['subtype'] -%}
+{%-     if 'dualtor' in switch_subtype.lower() %}
+{%-         set map_prio = 'sai_remap_prio_on_tnl_egress=1' -%}
+{%-     endif %}
+{%- endif %}
 sai_load_hw_config=/etc/bcm/flex/bcm56870_a0_premium_issu/b870.6.4.1/
 l3_alpm_hit_skip=1
 sai_adjust_acl_drop_in_rx_drop=1
+{{ map_prio }}
 host_as_route_disable=1
 use_all_splithorizon_groups=1
 riot_enable=1
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/sai.profile b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/sai.profile
index 1865041f8d9f..5163d6140f0e 100644
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/sai.profile
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/sai.profile
@@ -1,2 +1,2 @@
-SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td3-a7050cx3-32s-48x50G+8x100G.config.bcm
+SAI_INIT_CONFIG_FILE=/etc/sai.d/config.bcm
 SAI_NUM_ECMP_MEMBERS=64
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/config.bcm.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/config.bcm.j2
index db5b2562cca2..90d57545c099 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/config.bcm.j2
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/config.bcm.j2
@@ -1,6 +1,7 @@
 {# Construct config.bcm to include additional soc properties per specific device metadata requirement #}
 {%- set mmu_sock = 'mmu_init_config="MSFT-TH2-Tier1"' -%}
 {%- set IPinIP_sock = '' -%}
+{%- set map_prio = '' -%}
 {%- if DEVICE_METADATA is defined and DEVICE_METADATA['localhost'] is defined -%}
 {%-     if DEVICE_METADATA['localhost']['type'] is defined -%}
 {%-         set switch_role = DEVICE_METADATA['localhost']['type'] -%}
@@ -15,6 +16,7 @@
                                    sai_tunnel_underlay_route_mode=1
                                    host_as_route_disable=1
                                    l3_ecmp_levels=2' -%}
+{%-             set map_prio = 'sai_remap_prio_on_tnl_egress=1' -%}
 {%-         endif %}
 {%-     endif %}
 {%- endif %}
@@ -22,6 +24,7 @@
 
 l3_alpm_hit_skip=1
 sai_adjust_acl_drop_in_rx_drop=1
+{{ map_prio }}
 PHY_AN_ALLOW_PLL_CHANGE=1
 arl_clean_timeout_usec=15000000
 asf_mem_profile=2
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/config.bcm.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/config.bcm.j2
index 70512203f206..145426e05915 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/config.bcm.j2
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/config.bcm.j2
@@ -1,17 +1,20 @@
 {# Construct config.bcm to include additional soc properties per specific device metadata requirement #}
 {%- set IPinIP_sock = '' -%}
+{%- set map_prio = '' -%}
 {%- if DEVICE_METADATA is defined and DEVICE_METADATA['localhost'] is defined and DEVICE_METADATA['localhost']['subtype'] is defined -%}
 {%-     set switch_subtype = DEVICE_METADATA['localhost']['subtype'] -%}
 {%-     if 'dualtor' in switch_subtype.lower() %}
 {%-         set IPinIP_sock = 'sai_tunnel_support=1
                                sai_tunnel_underlay_route_mode=1
                                host_as_route_disable=1
-                               l3_ecmp_levels=2' -%}
+                               l3_ecmp_levels=2' -%} -%}
+{%-         set map_prio = 'sai_remap_prio_on_tnl_egress=1' -%}
 {%-     endif %}
 {%- endif %}
 {# The following is the common soc properties that used to be named "th2-a7260cx3-64-112x50G+8x100G.config.bcm" #}
 l3_alpm_hit_skip=1
 sai_adjust_acl_drop_in_rx_drop=1
+{{ map_prio }}
 PHY_AN_ALLOW_PLL_CHANGE=1
 arl_clean_timeout_usec=15000000
 asf_mem_profile=2
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/config.bcm.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/config.bcm.j2
index ce8efa8572b5..78194a75830e 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/config.bcm.j2
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/config.bcm.j2
@@ -1,6 +1,7 @@
 {# Construct config.bcm to include additional soc properties per specific device metadata requirement #}
 {%- set mmu_sock = 'mmu_init_config="MSFT-TH2-Tier1"' -%}
 {%- set IPinIP_sock = '' -%}
+{%- set map_prio = '' -%}
 {%- if DEVICE_METADATA is defined and DEVICE_METADATA['localhost'] is defined -%}
 {%-     if DEVICE_METADATA['localhost']['type'] is defined -%}
 {%-         set switch_role = DEVICE_METADATA['localhost']['type'] -%}
@@ -15,12 +16,14 @@
                                    sai_tunnel_underlay_route_mode=1
                                    host_as_route_disable=1
                                    l3_ecmp_levels=2' -%}
+{%-             set map_prio = 'sai_remap_prio_on_tnl_egress=1' -%}
 {%-         endif %}
 {%-     endif %}
 {%- endif %}
 {# The following is the common soc properties that used to be named "th2-a7260cx3-64-64x40G.config.bcm" #}
 l3_alpm_hit_skip=1
 sai_adjust_acl_drop_in_rx_drop=1
+{{ map_prio }}
 PHY_AN_ALLOW_PLL_CHANGE=1
 arl_clean_timeout_usec=15000000
 asf_mem_profile=2