diff --git a/platform/broadcom/sai-modules.mk b/platform/broadcom/sai-modules.mk
index ae65a00070..2eb459dd0d 100644
--- a/platform/broadcom/sai-modules.mk
+++ b/platform/broadcom/sai-modules.mk
@@ -10,7 +10,7 @@ $(BRCM_OPENNSL_KERNEL)_MACHINE = broadcom
 SONIC_DPKG_DEBS += $(BRCM_OPENNSL_KERNEL)
 
 # SAI bcm modules for DNX family ASIC
-BRCM_DNX_OPENNSL_KERNEL_VERSION = 11.2.13.1-1
+BRCM_DNX_OPENNSL_KERNEL_VERSION = 12.3.2.2
 
 BRCM_DNX_OPENNSL_KERNEL = opennsl-modules-dnx_$(BRCM_DNX_OPENNSL_KERNEL_VERSION)_amd64.deb
 $(BRCM_DNX_OPENNSL_KERNEL)_SRC_PATH = $(PLATFORM_PATH)/saibcm-modules-dnx
diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
index 326f481e3a..c186853a68 100644
--- a/platform/broadcom/sai.mk
+++ b/platform/broadcom/sai.mk
@@ -1,7 +1,7 @@
 LIBSAIBCM_XGS_VERSION = 12.3.2.2
-LIBSAIBCM_DNX_VERSION = 11.2.13.1-1
+LIBSAIBCM_DNX_VERSION = 12.3.2.2
 LIBSAIBCM_XGS_BRANCH_NAME = SAI_12.3.0_GA
-LIBSAIBCM_DNX_BRANCH_NAME = SAI_11.2.0_GA
+LIBSAIBCM_DNX_BRANCH_NAME = SAI_12.3.0_GA
 LIBSAIBCM_XGS_URL_PREFIX = "https://sonicstorage.blob.core.windows.net/public/sai/sai-broadcom/$(LIBSAIBCM_XGS_BRANCH_NAME)/$(LIBSAIBCM_XGS_VERSION)/xgs"
 LIBSAIBCM_DNX_URL_PREFIX = "https://sonicstorage.blob.core.windows.net/public/sai/sai-broadcom/$(LIBSAIBCM_DNX_BRANCH_NAME)/$(LIBSAIBCM_DNX_VERSION)/dnx"
 
diff --git a/platform/broadcom/saibcm-modules-dnx b/platform/broadcom/saibcm-modules-dnx
index 3a1e939bc2..dc9e885093 160000
--- a/platform/broadcom/saibcm-modules-dnx
+++ b/platform/broadcom/saibcm-modules-dnx
@@ -1 +1 @@
-Subproject commit 3a1e939bc2b7169953ebd89f2494341a34ed78f7
+Subproject commit dc9e88509398011df02db2e7efd030e796f4cb09
diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/thermal.py b/platform/mellanox/mlnx-platform-api/sonic_platform/thermal.py
index 8167885227..e4a48784ff 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/thermal.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/thermal.py
@@ -173,7 +173,10 @@ def initialize_chassis_thermals():
                 thermal_list.append(create_indexable_thermal(rule, index, CHASSIS_THERMAL_SYSFS_FOLDER, position))
                 position += 1
         elif thermal_type == 'discrete':
-            thermal_list.extend(create_discrete_thermal(rule))
+            discrete_thermals = create_discrete_thermal(rule, position)
+            if discrete_thermals:
+                position += len(discrete_thermals)
+                thermal_list.extend(discrete_thermals)
         else:
             thermal_object = create_single_thermal(rule, CHASSIS_THERMAL_SYSFS_FOLDER, position)
             if thermal_object:
@@ -280,10 +283,9 @@ def create_single_thermal(rule, sysfs_folder, position, presence_cb=None):
         return RemovableThermal(name, temp_file, high_th_file, high_crit_th_file, high_th_default, high_crit_th_default, scale, position, presence_cb)
 
 
-def create_discrete_thermal(rule):
+def create_discrete_thermal(rule, position):
     search_pattern = rule.get('search_pattern')
     index_pattern = rule.get('index_pattern')
-    position = 1
     thermal_list = []
     for file_path in glob.iglob(search_pattern):
         file_name = os.path.basename(file_path)