diff --git a/platform/mellanox/hw-management.mk b/platform/mellanox/hw-management.mk
index ff1ea20757..692a816a0f 100644
--- a/platform/mellanox/hw-management.mk
+++ b/platform/mellanox/hw-management.mk
@@ -1,6 +1,6 @@
 # Mellanox HW Management
 
-MLNX_HW_MANAGEMENT_VERSION = 7.0000.2308
+MLNX_HW_MANAGEMENT_VERSION = 7.0000.3012
 
 export MLNX_HW_MANAGEMENT_VERSION
 
diff --git a/platform/mellanox/hw-management/hw-mgmt b/platform/mellanox/hw-management/hw-mgmt
index 28d83cdb35..2f659142ab 160000
--- a/platform/mellanox/hw-management/hw-mgmt
+++ b/platform/mellanox/hw-management/hw-mgmt
@@ -1 +1 @@
-Subproject commit 28d83cdb3565d3b0352cc718fe82a14cacd1d4a5
+Subproject commit 2f659142ab3b4deb58989a2ca38b0b1671600509
diff --git a/src/sonic-linux-kernel b/src/sonic-linux-kernel
index 66e9dfa591..231bebb41b 160000
--- a/src/sonic-linux-kernel
+++ b/src/sonic-linux-kernel
@@ -1 +1 @@
-Subproject commit 66e9dfa591369782eff63f1de09818df3a941b29
+Subproject commit 231bebb41b86c9f744adc86972773d75fd4a2a2a