diff --git a/.gitmodules b/.gitmodules
index 83550bff59d7..e1e0e07eaad8 100755
--- a/.gitmodules
+++ b/.gitmodules
@@ -81,3 +81,6 @@
 [submodule "platform/broadcom/sonic-platform-modules-mitac"]
 	path = platform/broadcom/sonic-platform-modules-mitac
 	url = https://github.com/MiTAC-EBU/sonic-platform-modules-mitac.git
+[submodule "platform/mellanox/hw-management"]
+	path = platform/mellanox/hw-management
+	url = https://github.com/Mellanox/hw-mgmt/
diff --git a/platform/mellanox/hw-management b/platform/mellanox/hw-management
new file mode 160000
index 000000000000..ff83e6490d5c
--- /dev/null
+++ b/platform/mellanox/hw-management
@@ -0,0 +1 @@
+Subproject commit ff83e6490d5c36fff6bfb17781119b52e234f5f6
diff --git a/platform/mellanox/hw-management.mk b/platform/mellanox/hw-management.mk
index dcbce4564ee8..c63ccafa1579 100644
--- a/platform/mellanox/hw-management.mk
+++ b/platform/mellanox/hw-management.mk
@@ -1,10 +1,7 @@
 # Mellanox HW Management
 
-MLNX_HW_MANAGEMENT_VERSION = V1.0.0160
-
-export MLNX_HW_MANAGEMENT_VERSION
+MLNX_HW_MANAGEMENT_VERSION = onl.deb9.13.12.2017
 
 MLNX_HW_MANAGEMENT = hw-management_1.mlnx.$(MLNX_HW_MANAGEMENT_VERSION)_amd64.deb
 $(MLNX_HW_MANAGEMENT)_SRC_PATH = $(PLATFORM_PATH)/hw-management
-$(MLNX_HW_MANAGEMENT)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON)
-SONIC_MAKE_DEBS += $(MLNX_HW_MANAGEMENT)
+SONIC_DPKG_DEBS += $(MLNX_HW_MANAGEMENT)
diff --git a/platform/mellanox/hw-management/Makefile b/platform/mellanox/hw-management/Makefile
deleted file mode 100644
index ee2899d07c39..000000000000
--- a/platform/mellanox/hw-management/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-.ONESHELL:
-SHELL = /bin/bash
-
-MAIN_TARGET = hw-management_1.mlnx.$(MLNX_HW_MANAGEMENT_VERSION)_amd64.deb
-
-$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
-	# get sources
-	sudo rm -rf hw-management
-	git clone https://github.com/Mellanox/hw-mgmt/ -b $(MLNX_HW_MANAGEMENT_VERSION) hw-management
-
-	# build
-	pushd hw-management
-	sed "s~@SED_VERSION@~$(MLNX_HW_MANAGEMENT_VERSION)~" -i debian/changelog
-	chmod +x ./debian/rules
-	sudo ./debian/rules binary KVERSION=$(KVERSION)
-	popd
-
-	mv $* $(DEST)/