diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/td3-s5232f-32x100G.config.bcm b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/td3-s5232f-32x100G.config.bcm
index e3e2c5c86791..964046c808af 100644
--- a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/td3-s5232f-32x100G.config.bcm
+++ b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/td3-s5232f-32x100G.config.bcm
@@ -442,7 +442,7 @@ dport_map_port_26=26
 dport_map_port_27=27
 dport_map_port_28=28
 dport_map_port_29=29
-dport_map_port_30=20
+dport_map_port_30=30
 dport_map_port_31=31
 dport_map_port_32=32
 dport_map_port_33=33
@@ -455,7 +455,8 @@ dport_map_port_39=39
 dport_map_port_40=40
 dport_map_port_41=41
 dport_map_port_42=42
-dport_map_port_43=44
+dport_map_port_43=43
+dport_map_port_44=44
 dport_map_port_45=45
 dport_map_port_46=46
 dport_map_port_47=47
diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/td3-s5232f-32x100G.config.bcm b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/td3-s5232f-32x100G.config.bcm
index e3e2c5c86791..964046c808af 100644
--- a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/td3-s5232f-32x100G.config.bcm
+++ b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/td3-s5232f-32x100G.config.bcm
@@ -442,7 +442,7 @@ dport_map_port_26=26
 dport_map_port_27=27
 dport_map_port_28=28
 dport_map_port_29=29
-dport_map_port_30=20
+dport_map_port_30=30
 dport_map_port_31=31
 dport_map_port_32=32
 dport_map_port_33=33
@@ -455,7 +455,8 @@ dport_map_port_39=39
 dport_map_port_40=40
 dport_map_port_41=41
 dport_map_port_42=42
-dport_map_port_43=44
+dport_map_port_43=43
+dport_map_port_44=44
 dport_map_port_45=45
 dport_map_port_46=46
 dport_map_port_47=47
diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/td3-s5232f-8x100G-96x10G.config.bcm b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/td3-s5232f-96x10G-8x100G.config.bcm
similarity index 99%
rename from device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/td3-s5232f-8x100G-96x10G.config.bcm
rename to device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/td3-s5232f-96x10G-8x100G.config.bcm
index 26d37223c19c..cd7dfd2fea5f 100644
--- a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/td3-s5232f-8x100G-96x10G.config.bcm
+++ b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/td3-s5232f-96x10G-8x100G.config.bcm
@@ -515,7 +515,7 @@ dport_map_port_26=26
 dport_map_port_27=27
 dport_map_port_28=28
 dport_map_port_29=29
-dport_map_port_30=20
+dport_map_port_30=30
 dport_map_port_31=31
 dport_map_port_32=32
 dport_map_port_33=33
@@ -528,7 +528,8 @@ dport_map_port_39=39
 dport_map_port_40=40
 dport_map_port_41=41
 dport_map_port_42=42
-dport_map_port_43=44
+dport_map_port_43=43
+dport_map_port_44=44
 dport_map_port_45=45
 dport_map_port_46=46
 dport_map_port_47=47
diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/td3-s5232f-8x100G-96x25G.config.bcm b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/td3-s5232f-96x25G-8x100G.config.bcm
similarity index 99%
rename from device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/td3-s5232f-8x100G-96x25G.config.bcm
rename to device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/td3-s5232f-96x25G-8x100G.config.bcm
index 54104eb9f736..f76764e2756d 100644
--- a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/td3-s5232f-8x100G-96x25G.config.bcm
+++ b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/td3-s5232f-96x25G-8x100G.config.bcm
@@ -515,7 +515,7 @@ dport_map_port_26=26
 dport_map_port_27=27
 dport_map_port_28=28
 dport_map_port_29=29
-dport_map_port_30=20
+dport_map_port_30=30
 dport_map_port_31=31
 dport_map_port_32=32
 dport_map_port_33=33
@@ -528,7 +528,8 @@ dport_map_port_39=39
 dport_map_port_40=40
 dport_map_port_41=41
 dport_map_port_42=42
-dport_map_port_43=44
+dport_map_port_43=43
+dport_map_port_44=44
 dport_map_port_45=45
 dport_map_port_46=46
 dport_map_port_47=47