diff --git a/device/nokia/x86_64-nokia_ixr7250_x1b-r0/Nokia-IXR7250-X1b/q2cp-nokia-24x100g-12x400g-config.bcm b/device/nokia/x86_64-nokia_ixr7250_x1b-r0/Nokia-IXR7250-X1b/q2cp-nokia-24x100g-12x400g-config.bcm
index d79a7c4acaeb..9325f75021ee 100644
--- a/device/nokia/x86_64-nokia_ixr7250_x1b-r0/Nokia-IXR7250-X1b/q2cp-nokia-24x100g-12x400g-config.bcm
+++ b/device/nokia/x86_64-nokia_ixr7250_x1b-r0/Nokia-IXR7250-X1b/q2cp-nokia-24x100g-12x400g-config.bcm
@@ -1041,13 +1041,13 @@ sw_state_max_size=750000000
 system_headers_mode=1
 tdma_intr_enable=0
 tdma_timeout_usec=1000000
-tm_port_header_type_in_0=INJECTED_2
-tm_port_header_type_in_200=INJECTED_2_PP
-tm_port_header_type_in_201=INJECTED_2_PP
-tm_port_header_type_in_202=INJECTED_2_PP
-tm_port_header_type_in_203=INJECTED_2_PP
-tm_port_header_type_in_232=INJECTED_2
-tm_port_header_type_in_38=INJECTED_2
+tm_port_header_type_in_0=INJECTED
+tm_port_header_type_in_200=INJECTED
+tm_port_header_type_in_201=INJECTED
+tm_port_header_type_in_202=INJECTED
+tm_port_header_type_in_203=INJECTED
+tm_port_header_type_in_232=INJECTED
+tm_port_header_type_in_38=INJECTED
 tm_port_header_type_out_0=CPU
 tm_port_header_type_out_200=ETH
 tm_port_header_type_out_201=ETH
diff --git a/device/nokia/x86_64-nokia_ixr7250_x3b-r0/Nokia-IXR7250-X3B/0/jr2cp-nokia-18x400g-config.bcm b/device/nokia/x86_64-nokia_ixr7250_x3b-r0/Nokia-IXR7250-X3B/0/jr2cp-nokia-18x400g-config.bcm
index 4b9cc1875d5f..a36027cec441 100644
--- a/device/nokia/x86_64-nokia_ixr7250_x3b-r0/Nokia-IXR7250-X3B/0/jr2cp-nokia-18x400g-config.bcm
+++ b/device/nokia/x86_64-nokia_ixr7250_x3b-r0/Nokia-IXR7250-X3B/0/jr2cp-nokia-18x400g-config.bcm
@@ -1512,12 +1512,12 @@ sw_state_max_size.BCM8885X=750000000
 system_headers_mode=1
 tdma_intr_enable.BCM8885X=0
 tdma_timeout_usec.BCM8885X=1000000
-tm_port_header_type_in_0.BCM8885X=INJECTED_2
-tm_port_header_type_in_200.BCM8885X=INJECTED_2_PP
-tm_port_header_type_in_201.BCM8885X=INJECTED_2_PP
-tm_port_header_type_in_202.BCM8885X=INJECTED_2_PP
-tm_port_header_type_in_203.BCM8885X=INJECTED_2_PP
-tm_port_header_type_in_232.BCM8885X=INJECTED_2
+tm_port_header_type_in_0.BCM8885X=INJECTED
+tm_port_header_type_in_200.BCM8885X=INJECTED
+tm_port_header_type_in_201.BCM8885X=INJECTED
+tm_port_header_type_in_202.BCM8885X=INJECTED
+tm_port_header_type_in_203.BCM8885X=INJECTED
+tm_port_header_type_in_232.BCM8885X=INJECTED
 tm_port_header_type_in_19.BCM8885X=ETH
 tm_port_header_type_in_20.BCM8885X=ETH
 tm_port_header_type_out_0.BCM8885X=CPU
diff --git a/device/nokia/x86_64-nokia_ixr7250_x3b-r0/Nokia-IXR7250-X3B/1/jr2cp-nokia-18x400g-config.bcm b/device/nokia/x86_64-nokia_ixr7250_x3b-r0/Nokia-IXR7250-X3B/1/jr2cp-nokia-18x400g-config.bcm
index 8906632aeb46..16a7bb3e57d0 100644
--- a/device/nokia/x86_64-nokia_ixr7250_x3b-r0/Nokia-IXR7250-X3B/1/jr2cp-nokia-18x400g-config.bcm
+++ b/device/nokia/x86_64-nokia_ixr7250_x3b-r0/Nokia-IXR7250-X3B/1/jr2cp-nokia-18x400g-config.bcm
@@ -1514,12 +1514,12 @@ sw_state_max_size.BCM8885X=750000000
 system_headers_mode=1
 tdma_intr_enable.BCM8885X=0
 tdma_timeout_usec.BCM8885X=1000000
-tm_port_header_type_in_0.BCM8885X=INJECTED_2
-tm_port_header_type_in_200.BCM8885X=INJECTED_2_PP
-tm_port_header_type_in_201.BCM8885X=INJECTED_2_PP
-tm_port_header_type_in_202.BCM8885X=INJECTED_2_PP
-tm_port_header_type_in_203.BCM8885X=INJECTED_2_PP
-tm_port_header_type_in_232.BCM8885X=INJECTED_2
+tm_port_header_type_in_0.BCM8885X=INJECTED
+tm_port_header_type_in_200.BCM8885X=INJECTED
+tm_port_header_type_in_201.BCM8885X=INJECTED
+tm_port_header_type_in_202.BCM8885X=INJECTED
+tm_port_header_type_in_203.BCM8885X=INJECTED
+tm_port_header_type_in_232.BCM8885X=INJECTED
 tm_port_header_type_in_19.BCM8885X=ETH
 tm_port_header_type_in_20.BCM8885X=ETH
 tm_port_header_type_out_0.BCM8885X=CPU
diff --git a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/0/jr2cp-nokia-18x100g-4x25g-config.bcm b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/0/jr2cp-nokia-18x100g-4x25g-config.bcm
index 921fac5bf0c0..42be59e0b24d 100644
--- a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/0/jr2cp-nokia-18x100g-4x25g-config.bcm
+++ b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/0/jr2cp-nokia-18x100g-4x25g-config.bcm
@@ -1492,12 +1492,12 @@ sw_state_max_size.BCM8885X=750000000
 system_headers_mode=1
 tdma_intr_enable.BCM8885X=0
 tdma_timeout_usec.BCM8885X=1000000
-tm_port_header_type_in_0.BCM8885X=INJECTED_2
-tm_port_header_type_in_200.BCM8885X=INJECTED_2_PP
-tm_port_header_type_in_201.BCM8885X=INJECTED_2_PP
-tm_port_header_type_in_202.BCM8885X=INJECTED_2_PP
-tm_port_header_type_in_203.BCM8885X=INJECTED_2_PP
-tm_port_header_type_in_232.BCM8885X=INJECTED_2
+tm_port_header_type_in_0.BCM8885X=INJECTED
+tm_port_header_type_in_200.BCM8885X=INJECTED
+tm_port_header_type_in_201.BCM8885X=INJECTED
+tm_port_header_type_in_202.BCM8885X=INJECTED
+tm_port_header_type_in_203.BCM8885X=INJECTED
+tm_port_header_type_in_232.BCM8885X=INJECTED
 tm_port_header_type_in_19.BCM8885X=ETH
 tm_port_header_type_in_20.BCM8885X=ETH
 tm_port_header_type_out_0.BCM8885X=CPU
diff --git a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/jr2cp-nokia-18x100g-4x25g-config.bcm b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/jr2cp-nokia-18x100g-4x25g-config.bcm
index d60508a6c352..b3a465656ca1 100644
--- a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/jr2cp-nokia-18x100g-4x25g-config.bcm
+++ b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/jr2cp-nokia-18x100g-4x25g-config.bcm
@@ -1511,12 +1511,12 @@ sw_state_max_size.BCM8885X=750000000
 system_headers_mode=1
 tdma_intr_enable.BCM8885X=0
 tdma_timeout_usec.BCM8885X=1000000
-tm_port_header_type_in_0.BCM8885X=INJECTED_2
-tm_port_header_type_in_200.BCM8885X=INJECTED_2_PP
-tm_port_header_type_in_201.BCM8885X=INJECTED_2_PP
-tm_port_header_type_in_202.BCM8885X=INJECTED_2_PP
-tm_port_header_type_in_203.BCM8885X=INJECTED_2_PP
-tm_port_header_type_in_232.BCM8885X=INJECTED_2
+tm_port_header_type_in_0.BCM8885X=INJECTED
+tm_port_header_type_in_200.BCM8885X=INJECTED
+tm_port_header_type_in_201.BCM8885X=INJECTED
+tm_port_header_type_in_202.BCM8885X=INJECTED
+tm_port_header_type_in_203.BCM8885X=INJECTED
+tm_port_header_type_in_232.BCM8885X=INJECTED
 tm_port_header_type_in_19.BCM8885X=ETH
 tm_port_header_type_in_20.BCM8885X=ETH
 tm_port_header_type_out_0.BCM8885X=CPU
diff --git a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/0/jr2cp-nokia-18x400g-config.bcm b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/0/jr2cp-nokia-18x400g-config.bcm
index a711a73e541e..658c1bb482b8 100644
--- a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/0/jr2cp-nokia-18x400g-config.bcm
+++ b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/0/jr2cp-nokia-18x400g-config.bcm
@@ -1512,12 +1512,12 @@ sw_state_max_size.BCM8885X=750000000
 system_headers_mode=1
 tdma_intr_enable.BCM8885X=0
 tdma_timeout_usec.BCM8885X=1000000
-tm_port_header_type_in_0.BCM8885X=INJECTED_2
-tm_port_header_type_in_200.BCM8885X=INJECTED_2_PP
-tm_port_header_type_in_201.BCM8885X=INJECTED_2_PP
-tm_port_header_type_in_202.BCM8885X=INJECTED_2_PP
-tm_port_header_type_in_203.BCM8885X=INJECTED_2_PP
-tm_port_header_type_in_232.BCM8885X=INJECTED_2
+tm_port_header_type_in_0.BCM8885X=INJECTED
+tm_port_header_type_in_200.BCM8885X=INJECTED
+tm_port_header_type_in_201.BCM8885X=INJECTED
+tm_port_header_type_in_202.BCM8885X=INJECTED
+tm_port_header_type_in_203.BCM8885X=INJECTED
+tm_port_header_type_in_232.BCM8885X=INJECTED
 tm_port_header_type_in_19.BCM8885X=ETH
 tm_port_header_type_in_20.BCM8885X=ETH
 tm_port_header_type_out_0.BCM8885X=CPU
diff --git a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/1/jr2cp-nokia-18x400g-config.bcm b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/1/jr2cp-nokia-18x400g-config.bcm
index e4b53ed97e7e..d395a9d351f1 100644
--- a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/1/jr2cp-nokia-18x400g-config.bcm
+++ b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/1/jr2cp-nokia-18x400g-config.bcm
@@ -1512,12 +1512,12 @@ sw_state_max_size.BCM8885X=750000000
 system_headers_mode=1
 tdma_intr_enable.BCM8885X=0
 tdma_timeout_usec.BCM8885X=1000000
-tm_port_header_type_in_0.BCM8885X=INJECTED_2
-tm_port_header_type_in_200.BCM8885X=INJECTED_2_PP
-tm_port_header_type_in_201.BCM8885X=INJECTED_2_PP
-tm_port_header_type_in_202.BCM8885X=INJECTED_2_PP
-tm_port_header_type_in_203.BCM8885X=INJECTED_2_PP
-tm_port_header_type_in_232.BCM8885X=INJECTED_2
+tm_port_header_type_in_0.BCM8885X=INJECTED
+tm_port_header_type_in_200.BCM8885X=INJECTED
+tm_port_header_type_in_201.BCM8885X=INJECTED
+tm_port_header_type_in_202.BCM8885X=INJECTED
+tm_port_header_type_in_203.BCM8885X=INJECTED
+tm_port_header_type_in_232.BCM8885X=INJECTED
 tm_port_header_type_in_19.BCM8885X=ETH
 tm_port_header_type_in_20.BCM8885X=ETH
 tm_port_header_type_out_0.BCM8885X=CPU