diff --git a/platform/mellanox/sdk-src/applibs/Makefile b/platform/mellanox/sdk-src/applibs/Makefile
deleted file mode 100644
index 47e4f5388db..00000000000
--- a/platform/mellanox/sdk-src/applibs/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-.ONESHELL:
-SHELL = /bin/bash
-
-MAIN_TARGET = applibs_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb
-DERIVED_TARGETS = applibs-dev_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb applibs-dbgsym_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb
-PACKAGE_NAME = applibs
-
-$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
-	# get sources
-	rm -rf $(PACKAGE_NAME)-$(MLNX_SDK_VERSION)-$(MLNX_SDK_ISSU_VERSION)
-
-	wget -c $(MLNX_SDK_SOURCE_BASE_URL)/$(PACKAGE_NAME)-$(MLNX_SDK_VERSION)-$(MLNX_SDK_ISSU_VERSION).tar.gz -O - | tar -xz
-
-	# build
-	pushd $(PACKAGE_NAME)-$(MLNX_SDK_VERSION)-$(MLNX_SDK_ISSU_VERSION)
-
-	sed -i "s/sx-libnl/$(LIBNL3)/g" ./debian/control
-	sed -i "s/-Werror//g" ./configure.in
-
-	if [ -f autogen.sh ]; then
-		./autogen.sh
-	fi
-
-	debuild -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS)
-
-	popd
-
-	mv $(DERIVED_TARGETS) $* $(DEST)/
-
-$(addprefix $(DEST)/, $(DERIVED_TARGETS)): $(DEST)/% : $(DEST)/$(MAIN_TARGET)
diff --git a/platform/mellanox/sdk-src/python-sdk-api/Makefile b/platform/mellanox/sdk-src/python-sdk-api/Makefile
deleted file mode 100644
index 5ac3e850496..00000000000
--- a/platform/mellanox/sdk-src/python-sdk-api/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-.ONESHELL:
-SHELL = /bin/bash
-
-MAIN_TARGET = python-sdk-api_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb
-DERIVED_TARGETS = python-sdk-api-dbgsym_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb
-PACKAGE_NAME = python_sdk_api
-
-$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
-	# get sources
-	rm -rf $(PACKAGE_NAME)-$(MLNX_SDK_VERSION)-$(MLNX_SDK_ISSU_VERSION)
-
-	wget -c $(MLNX_SDK_SOURCE_BASE_URL)/$(PACKAGE_NAME)-$(MLNX_SDK_VERSION)-$(MLNX_SDK_ISSU_VERSION).tar.gz -O - | tar -xz
-
-	# build
-	pushd $(PACKAGE_NAME)-$(MLNX_SDK_VERSION)-$(MLNX_SDK_ISSU_VERSION)
-
-	if [ -f autogen.sh ]; then
-		./autogen.sh
-	fi
-
-	debuild -e PYTHON_INTERPRETERS="\"python2 python3\"" -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS)
-
-	popd
-
-	mv $(DERIVED_TARGETS) $* $(DEST)/
-
-$(addprefix $(DEST)/, $(DERIVED_TARGETS)): $(DEST)/% : $(DEST)/$(MAIN_TARGET)
diff --git a/platform/mellanox/sdk-src/sx-acl-helper/Makefile b/platform/mellanox/sdk-src/sx-acl-helper/Makefile
deleted file mode 100644
index 42109c74e0b..00000000000
--- a/platform/mellanox/sdk-src/sx-acl-helper/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-.ONESHELL:
-SHELL = /bin/bash
-
-MAIN_TARGET = sx-acl-helper_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb
-DERIVED_TARGETS = sx-acl-helper-dev_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb \
-				  sx-acl-helper-dev-static_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb \
-				  sx-acl-helper-dbgsym_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb
-PACKAGE_NAME = sx_acl_helper
-
-$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
-	# get sources
-	rm -rf $(PACKAGE_NAME)-$(MLNX_SDK_VERSION)-$(MLNX_SDK_ISSU_VERSION)
-
-	wget -c $(MLNX_SDK_SOURCE_BASE_URL)/$(PACKAGE_NAME)-$(MLNX_SDK_VERSION)-$(MLNX_SDK_ISSU_VERSION).tar.gz -O - | tar -xz
-
-	# build
-	pushd $(PACKAGE_NAME)-$(MLNX_SDK_VERSION)-$(MLNX_SDK_ISSU_VERSION)
-
-	if [ -f autogen.sh ]; then
-		./autogen.sh
-	fi
-
-	debuild -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS)
-
-	popd
-
-	mv $(DERIVED_TARGETS) $* $(DEST)/
-
-$(addprefix $(DEST)/, $(DERIVED_TARGETS)): $(DEST)/% : $(DEST)/$(MAIN_TARGET)
diff --git a/platform/mellanox/sdk-src/sx-complib/Makefile b/platform/mellanox/sdk-src/sx-complib/Makefile
deleted file mode 100644
index c717ffda93c..00000000000
--- a/platform/mellanox/sdk-src/sx-complib/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-.ONESHELL:
-SHELL = /bin/bash
-
-MAIN_TARGET = sx-complib_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb
-DERIVED_TARGETS = sx-complib-dev_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb \
-				  sx-complib-dev-static_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb \
-				  sx-complib-dbgsym_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb
-PACKAGE_NAME = sx_complib
-
-$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
-	# get sources
-	rm -rf $(PACKAGE_NAME)-$(MLNX_SDK_VERSION)-$(MLNX_SDK_ISSU_VERSION)
-
-	wget -c $(MLNX_SDK_SOURCE_BASE_URL)/$(PACKAGE_NAME)-$(MLNX_SDK_VERSION)-$(MLNX_SDK_ISSU_VERSION).tar.gz -O - | tar -xz
-
-	# build
-	pushd $(PACKAGE_NAME)-$(MLNX_SDK_VERSION)-$(MLNX_SDK_ISSU_VERSION)
-
-	if [ -f autogen.sh ]; then
-		./autogen.sh
-	fi
-
-	debuild -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS)
-
-	popd
-
-	mv $(DERIVED_TARGETS) $* $(DEST)/
-
-$(addprefix $(DEST)/, $(DERIVED_TARGETS)): $(DEST)/% : $(DEST)/$(MAIN_TARGET)
diff --git a/platform/mellanox/sdk-src/sx-examples/Makefile b/platform/mellanox/sdk-src/sx-examples/Makefile
deleted file mode 100644
index 2084e397f98..00000000000
--- a/platform/mellanox/sdk-src/sx-examples/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-.ONESHELL:
-SHELL = /bin/bash
-
-MAIN_TARGET = sx-examples_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb
-DERIVED_TARGETS = sx-examples-dev_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb sx-examples-dbgsym_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb
-PACKAGE_NAME = sx_examples
-
-$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
-	# get sources
-	rm -rf $(PACKAGE_NAME)-$(MLNX_SDK_VERSION)-$(MLNX_SDK_ISSU_VERSION)
-
-	wget -c $(MLNX_SDK_SOURCE_BASE_URL)/$(PACKAGE_NAME)-$(MLNX_SDK_VERSION)-$(MLNX_SDK_ISSU_VERSION).tar.gz -O - | tar -xz
-
-	# build
-	pushd $(PACKAGE_NAME)-$(MLNX_SDK_VERSION)-$(MLNX_SDK_ISSU_VERSION)
-
-	if [ -f autogen.sh ]; then
-		./autogen.sh
-	fi
-
-	debuild -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS)
-
-	popd
-
-	mv $(DERIVED_TARGETS) $* $(DEST)/
-
-$(addprefix $(DEST)/, $(DERIVED_TARGETS)): $(DEST)/% : $(DEST)/$(MAIN_TARGET)
diff --git a/platform/mellanox/sdk-src/sx-gen-utils/Makefile b/platform/mellanox/sdk-src/sx-gen-utils/Makefile
deleted file mode 100644
index 66d2fb6b453..00000000000
--- a/platform/mellanox/sdk-src/sx-gen-utils/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-.ONESHELL:
-SHELL = /bin/bash
-
-MAIN_TARGET = sx-gen-utils_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb
-DERIVED_TARGETS = sx-gen-utils-dev_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb sx-gen-utils-dbgsym_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb
-PACKAGE_NAME = sx_gen_utils
-
-$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
-	# get sources
-	rm -rf $(PACKAGE_NAME)-$(MLNX_SDK_VERSION)-$(MLNX_SDK_ISSU_VERSION)
-
-	wget -c $(MLNX_SDK_SOURCE_BASE_URL)/$(PACKAGE_NAME)-$(MLNX_SDK_VERSION)-$(MLNX_SDK_ISSU_VERSION).tar.gz -O - | tar -xz
-
-	# build
-	pushd $(PACKAGE_NAME)-$(MLNX_SDK_VERSION)-$(MLNX_SDK_ISSU_VERSION)
-
-	if [ -f autogen.sh ]; then
-		./autogen.sh
-	fi
-
-	debuild -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS)
-
-	popd
-
-	mv $(DERIVED_TARGETS) $* $(DEST)/
-
-$(addprefix $(DEST)/, $(DERIVED_TARGETS)): $(DEST)/% : $(DEST)/$(MAIN_TARGET)
diff --git a/platform/mellanox/sdk-src/sx-hash-calc/Makefile b/platform/mellanox/sdk-src/sx-hash-calc/Makefile
deleted file mode 100644
index 927d4bc892a..00000000000
--- a/platform/mellanox/sdk-src/sx-hash-calc/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-.ONESHELL:
-SHELL = /bin/bash
-
-MAIN_TARGET = sx-hash-calc_1.mlnx.$(MLNX_SDK_DEB_VERSION)_amd64.deb
-DERIVED_TARGETS = sx-hash-calc-dbgsym_1.mlnx.$(MLNX_SDK_DEB_VERSION)_amd64.deb
-PACKAGE_NAME = sx_hash_calc
-
-$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
-	# get sources
-	rm -rf $(PACKAGE_NAME)-$(MLNX_SDK_VERSION)-$(MLNX_SDK_ISSU_VERSION)
-
-	wget -c $(MLNX_SDK_SOURCE_BASE_URL)/$(PACKAGE_NAME)-$(MLNX_SDK_VERSION)-$(MLNX_SDK_ISSU_VERSION).tar.gz -O - | tar -xz
-
-	# build
-	pushd $(PACKAGE_NAME)-$(MLNX_SDK_VERSION)-$(MLNX_SDK_ISSU_VERSION)
-
-	if [ -f autogen.sh ]; then
-		./autogen.sh
-	fi
-
-	debuild -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS)
-
-	popd
-
-	mv $(DERIVED_TARGETS) $* $(DEST)/
-
-$(addprefix $(DEST)/, $(DERIVED_TARGETS)): $(DEST)/% : $(DEST)/$(MAIN_TARGET)
diff --git a/platform/mellanox/sdk-src/sx-scew/Makefile b/platform/mellanox/sdk-src/sx-scew/Makefile
deleted file mode 100644
index 8bb61fcda67..00000000000
--- a/platform/mellanox/sdk-src/sx-scew/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-.ONESHELL:
-SHELL = /bin/bash
-
-MAIN_TARGET = sx-scew_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb
-DERIVED_TARGETS = sx-scew-dev_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb \
-				  sx-scew-dev-static_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb \
-				  sx-scew-dbgsym_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb
-PACKAGE_NAME = sx_scew
-
-$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
-	# get sources
-	rm -rf $(PACKAGE_NAME)-$(MLNX_SDK_VERSION)-$(MLNX_SDK_ISSU_VERSION)
-
-	wget -c $(MLNX_SDK_SOURCE_BASE_URL)/$(PACKAGE_NAME)-$(MLNX_SDK_VERSION)-$(MLNX_SDK_ISSU_VERSION).tar.gz -O - | tar -xz
-
-	# build
-	pushd $(PACKAGE_NAME)-$(MLNX_SDK_VERSION)-$(MLNX_SDK_ISSU_VERSION)
-
-	if [ -f autogen.sh ]; then
-		./autogen.sh
-	fi
-
-	debuild -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS)
-
-	popd
-
-	mv $(DERIVED_TARGETS) $* $(DEST)/
-
-$(addprefix $(DEST)/, $(DERIVED_TARGETS)): $(DEST)/% : $(DEST)/$(MAIN_TARGET)
diff --git a/platform/mellanox/sdk-src/sxd-libs/Makefile b/platform/mellanox/sdk-src/sxd-libs/Makefile
deleted file mode 100644
index 0472056c987..00000000000
--- a/platform/mellanox/sdk-src/sxd-libs/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-.ONESHELL:
-SHELL = /bin/bash
-
-MAIN_TARGET = sxd-libs_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb
-DERIVED_TARGETS = sxd-libs-dev_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb \
-				  sxd-libs-dev-static_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb \
-				  sxd-libs-dbgsym_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb
-PACKAGE_NAME = sxd_libs
-
-$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
-	# get sources
-	rm -rf $(PACKAGE_NAME)-$(MLNX_SDK_VERSION)-$(MLNX_SDK_ISSU_VERSION)
-
-	wget -c $(MLNX_SDK_SOURCE_BASE_URL)/$(PACKAGE_NAME)-$(MLNX_SDK_VERSION)-$(MLNX_SDK_ISSU_VERSION).tar.gz -O - | tar -xz
-
-	# build
-	pushd $(PACKAGE_NAME)-$(MLNX_SDK_VERSION)-$(MLNX_SDK_ISSU_VERSION)
-
-	if [ -f autogen.sh ]; then
-		./autogen.sh
-	fi
-
-	debuild -e 'configure_options=--enable-sniffer=yes' -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS)
-
-	popd
-
-	mv $(DERIVED_TARGETS) $* $(DEST)/
-
-$(addprefix $(DEST)/, $(DERIVED_TARGETS)): $(DEST)/% : $(DEST)/$(MAIN_TARGET)
diff --git a/platform/mellanox/sdk-src/sys-sdk/Makefile b/platform/mellanox/sdk-src/sys-sdk/Makefile
new file mode 100644
index 00000000000..bb6e19a5920
--- /dev/null
+++ b/platform/mellanox/sdk-src/sys-sdk/Makefile
@@ -0,0 +1,32 @@
+.ONESHELL:
+SHELL = /bin/bash
+
+MAIN_TARGET = sys-sdk_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb
+DERIVED_TARGETS = 
+PACKAGE_NAME = sys_sdk
+
+$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
+
+	# get sources
+
+	rm -rf sys_sdk-$(MLNX_SDK_VERSION)-$(MLNX_SDK_ISSU_VERSION)
+
+	wget -c $(MLNX_SDK_SOURCE_BASE_URL)/$(PACKAGE_NAME)-$(MLNX_SDK_VERSION)-$(MLNX_SDK_ISSU_VERSION).tar.gz -O - | tar -xz
+
+	# build
+
+	pushd $(PACKAGE_NAME)-$(MLNX_SDK_VERSION)-$(MLNX_SDK_ISSU_VERSION)
+
+	cmake -B builds/cmake -DSKIP_UNINSTALL_INSTALL_DEPENDENCY=on -DSKIP_DEPMOD_IN_INSTALL_PHASE=on -DUSE_API_TESTER=OFF -DUSE_KERNEL=OFF -DCMAKE_PROJECT_VERSION=$(MLNX_SDK_DEB_VERSION)
+
+	cmake --build builds/cmake -j$(SONIC_CONFIG_MAKE_JOBS)
+
+	cd builds/cmake
+
+	cpack -G DEB 
+
+	popd
+
+	mv $(DERIVED_TARGETS) $* $(DEST)/
+
+$(addprefix $(DEST)/, $(DERIVED_TARGETS)): $(DEST)/% : $(DEST)/$(MAIN_TARGET)
diff --git a/platform/mellanox/sdk-src/wjh-libs/Makefile b/platform/mellanox/sdk-src/wjh-libs/Makefile
deleted file mode 100644
index d5af48b7c55..00000000000
--- a/platform/mellanox/sdk-src/wjh-libs/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-.ONESHELL:
-SHELL = /bin/bash
-
-MAIN_TARGET = wjh-libs_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb
-DERIVED_TARGETS = wjh-libs-dev_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb \
-				  wjh-libs-dev-static_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb \
-				  wjh-libs-dbgsym_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb
-PACKAGE_NAME = wjh_libs
-
-$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
-	# get sources
-	rm -rf $(PACKAGE_NAME)-$(MLNX_SDK_VERSION)-$(MLNX_SDK_ISSU_VERSION)
-
-	wget -c $(MLNX_SDK_SOURCE_BASE_URL)/$(PACKAGE_NAME)-$(MLNX_SDK_VERSION)-$(MLNX_SDK_ISSU_VERSION).tar.gz -O - | tar -xz
-
-	# build
-	pushd $(PACKAGE_NAME)-$(MLNX_SDK_VERSION)-$(MLNX_SDK_ISSU_VERSION)
-
-	if [ -f autogen.sh ]; then
-		./autogen.sh
-	fi
-
-	debuild -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS)
-
-	popd
-
-	mv $(DERIVED_TARGETS) $* $(DEST)/
-
-$(addprefix $(DEST)/, $(DERIVED_TARGETS)): $(DEST)/% : $(DEST)/$(MAIN_TARGET)
diff --git a/platform/mellanox/sdk.dep b/platform/mellanox/sdk.dep
index e5be175286c..97ad0b25acf 100644
--- a/platform/mellanox/sdk.dep
+++ b/platform/mellanox/sdk.dep
@@ -10,208 +10,6 @@
 # SONIC_OVERRIDE_BUILD_VARS.
 MLNX_SDK_COMMON_FLAGS_LIST = $(SONIC_COMMON_FLAGS_LIST) $(MLNX_SDK_DEB_VERSION)
 
-# APPLIBS
-
-SPATH := $($(APPLIBS)_SRC_PATH)
-DEP_FILES := $(SONIC_COMMON_FILES_LIST) $(PLATFORM_PATH)/sdk.mk $(PLATFORM_PATH)/sdk.dep
-DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST)
-DEP_FILES += $(shell git ls-files -- $(SPATH))
-
-$(APPLIBS)_CACHE_MODE := GIT_CONTENT_SHA
-$(APPLIBS)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
-$(APPLIBS)_DEP_FILES := $(DEP_FILES)
-
-$(APPLIBS_DEV)_CACHE_MODE := GIT_CONTENT_SHA
-$(APPLIBS_DEV)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
-$(APPLIBS_DEV)_DEP_FILES := $(DEP_FILES)
-
-ifeq ($(SDK_FROM_SRC),y)
-$(APPLIBS_DBGSYM)_CACHE_MODE := GIT_CONTENT_SHA
-$(APPLIBS_DBGSYM)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
-$(APPLIBS_DBGSYM)_DEP_FILES := $(DEP_FILES)
-endif
-
-# SX_COMPLIB
-
-SPATH := $($(SX_COMPLIB)_SRC_PATH)
-DEP_FILES := $(SONIC_COMMON_FILES_LIST) $(PLATFORM_PATH)/sdk.mk $(PLATFORM_PATH)/sdk.dep
-DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST)
-DEP_FILES += $(shell git ls-files -- $(SPATH))
-
-$(SX_COMPLIB)_CACHE_MODE := GIT_CONTENT_SHA
-$(SX_COMPLIB)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
-$(SX_COMPLIB)_DEP_FILES := $(DEP_FILES)
-
-$(SX_COMPLIB_DEV)_CACHE_MODE := GIT_CONTENT_SHA
-$(SX_COMPLIB_DEV)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
-$(SX_COMPLIB_DEV)_DEP_FILES := $(DEP_FILES)
-
-ifeq ($(SDK_FROM_SRC),y)
-$(SX_COMPLIB_DBGSYM)_CACHE_MODE := GIT_CONTENT_SHA
-$(SX_COMPLIB_DBGSYM)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
-$(SX_COMPLIB_DBGSYM)_DEP_FILES := $(DEP_FILES)
-endif
-
-# SX_EXAMPLES
-
-SPATH := $($(SX_EXAMPLES)_SRC_PATH)
-DEP_FILES := $(SONIC_COMMON_FILES_LIST) $(PLATFORM_PATH)/sdk.mk $(PLATFORM_PATH)/sdk.dep
-DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST)
-DEP_FILES += $(shell git ls-files -- $(SPATH))
-
-$(SX_EXAMPLES)_CACHE_MODE := GIT_CONTENT_SHA
-$(SX_EXAMPLES)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
-$(SX_EXAMPLES)_DEP_FILES := $(DEP_FILES)
-
-$(SX_EXAMPLES_DEV)_CACHE_MODE := GIT_CONTENT_SHA
-$(SX_EXAMPLES_DEV)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
-$(SX_EXAMPLES_DEV)_DEP_FILES := $(DEP_FILES)
-
-ifeq ($(SDK_FROM_SRC),y)
-$(SX_EXAMPLES_DBGSYM)_CACHE_MODE := GIT_CONTENT_SHA
-$(SX_EXAMPLES_DBGSYM)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
-$(SX_EXAMPLES_DBGSYM)_DEP_FILES := $(DEP_FILES)
-endif
-
-# SX_GEN_UTILS
-
-SPATH := $($(SX_GEN_UTILS)_SRC_PATH)
-DEP_FILES := $(SONIC_COMMON_FILES_LIST) $(PLATFORM_PATH)/sdk.mk $(PLATFORM_PATH)/sdk.dep
-DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST)
-DEP_FILES += $(shell git ls-files -- $(SPATH))
-
-$(SX_GEN_UTILS)_CACHE_MODE := GIT_CONTENT_SHA
-$(SX_GEN_UTILS)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
-$(SX_GEN_UTILS)_DEP_FILES := $(DEP_FILES)
-
-$(SX_GEN_UTILS_DEV)_CACHE_MODE := GIT_CONTENT_SHA
-$(SX_GEN_UTILS_DEV)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
-$(SX_GEN_UTILS_DEV)_DEP_FILES := $(DEP_FILES)
-
-ifeq ($(SDK_FROM_SRC),y)
-$(SX_GEN_UTILS_DBGSYM)_CACHE_MODE := GIT_CONTENT_SHA
-$(SX_GEN_UTILS_DBGSYM)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
-$(SX_GEN_UTILS_DBGSYM)_DEP_FILES := $(DEP_FILES)
-endif
-
-# SX_SCEW
-
-SPATH := $($(SX_SCEW)_SRC_PATH)
-DEP_FILES := $(SONIC_COMMON_FILES_LIST) $(PLATFORM_PATH)/sdk.mk $(PLATFORM_PATH)/sdk.dep
-DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST)
-DEP_FILES += $(shell git ls-files -- $(SPATH))
-
-$(SX_SCEW)_CACHE_MODE := GIT_CONTENT_SHA
-$(SX_SCEW)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
-$(SX_SCEW)_DEP_FILES := $(DEP_FILES)
-
-$(SX_SCEW_DEV)_CACHE_MODE := GIT_CONTENT_SHA
-$(SX_SCEW_DEV)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
-$(SX_SCEW_DEV)_DEP_FILES := $(DEP_FILES)
-
-ifeq ($(SDK_FROM_SRC),y)
-$(SX_SCEW_DBGSYM)_CACHE_MODE := GIT_CONTENT_SHA
-$(SX_SCEW_DBGSYM)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
-$(SX_SCEW_DBGSYM)_DEP_FILES := $(DEP_FILES)
-endif
-
-# SXD_LIBS
-
-SPATH := $($(SXD_LIBS)_SRC_PATH)
-DEP_FILES := $(SONIC_COMMON_FILES_LIST) $(PLATFORM_PATH)/sdk.mk $(PLATFORM_PATH)/sdk.dep
-DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST)
-DEP_FILES += $(shell git ls-files -- $(SPATH))
-
-$(SXD_LIBS)_CACHE_MODE := GIT_CONTENT_SHA
-$(SXD_LIBS)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
-$(SXD_LIBS)_DEP_FILES := $(DEP_FILES)
-
-$(SXD_LIBS_DEV)_CACHE_MODE := GIT_CONTENT_SHA
-$(SXD_LIBS_DEV)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
-$(SXD_LIBS_DEV)_DEP_FILES := $(DEP_FILES)
-
-ifeq ($(SDK_FROM_SRC),y)
-$(SXD_LIBS_DBGSYM)_CACHE_MODE := GIT_CONTENT_SHA
-$(SXD_LIBS_DBGSYM)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
-$(SXD_LIBS_DBGSYM)_DEP_FILES := $(DEP_FILES)
-endif
-
-# PYTHON_SDK_API
-
-SPATH := $($(PYTHON_SDK_API)_SRC_PATH)
-DEP_FILES := $(SONIC_COMMON_FILES_LIST) $(PLATFORM_PATH)/sdk.mk $(PLATFORM_PATH)/sdk.dep
-DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST)
-DEP_FILES += $(shell git ls-files -- $(SPATH))
-
-$(PYTHON_SDK_API)_CACHE_MODE := GIT_CONTENT_SHA
-$(PYTHON_SDK_API)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
-$(PYTHON_SDK_API)_DEP_FILES := $(DEP_FILES)
-
-ifeq ($(SDK_FROM_SRC),y)
-$(PYTHON_SDK_API_DBGSYM)_CACHE_MODE := GIT_CONTENT_SHA
-$(PYTHON_SDK_API_DBGSYM)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
-$(PYTHON_SDK_API_DBGSYM)_DEP_FILES := $(DEP_FILES)
-endif
-
-# SX_ACL_HELPER
-
-SPATH := $($(SX_ACL_HELPER)_SRC_PATH)
-DEP_FILES := $(SONIC_COMMON_FILES_LIST) $(PLATFORM_PATH)/sdk.mk $(PLATFORM_PATH)/sdk.dep
-DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST)
-DEP_FILES += $(shell git ls-files -- $(SPATH))
-
-$(SX_ACL_HELPER)_CACHE_MODE := GIT_CONTENT_SHA
-$(SX_ACL_HELPER)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
-$(SX_ACL_HELPER)_DEP_FILES := $(DEP_FILES)
-
-$(SX_ACL_HELPER_DEV)_CACHE_MODE := GIT_CONTENT_SHA
-$(SX_ACL_HELPER_DEV)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
-$(SX_ACL_HELPER_DEV)_DEP_FILES := $(DEP_FILES)
-
-ifeq ($(SDK_FROM_SRC),y)
-$(SX_ACL_HELPER_DBGSYM)_CACHE_MODE := GIT_CONTENT_SHA
-$(SX_ACL_HELPER_DBGSYM)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
-$(SX_ACL_HELPER_DBGSYM)_DEP_FILES := $(DEP_FILES)
-endif
-
-# WJH_LIBS
-
-SPATH := $($(WJH_LIBS)_SRC_PATH)
-DEP_FILES := $(SONIC_COMMON_FILES_LIST) $(PLATFORM_PATH)/sdk.mk $(PLATFORM_PATH)/sdk.dep
-DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST)
-DEP_FILES += $(shell git ls-files -- $(SPATH))
-
-$(WJH_LIBS)_CACHE_MODE := GIT_CONTENT_SHA
-$(WJH_LIBS)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
-$(WJH_LIBS)_DEP_FILES := $(DEP_FILES)
-
-$(WJH_LIBS_DEV)_CACHE_MODE := GIT_CONTENT_SHA
-$(WJH_LIBS_DEV)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
-$(WJH_LIBS_DEV)_DEP_FILES := $(DEP_FILES)
-
-ifeq ($(SDK_FROM_SRC),y)
-$(WJH_LIBS_DBGSYM)_CACHE_MODE := GIT_CONTENT_SHA
-$(WJH_LIBS_DBGSYM)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
-$(WJH_LIBS_DBGSYM)_DEP_FILES := $(DEP_FILES)
-endif
-
-# SX_HASH_CALC
-
-SPATH := $($(SX_HASH_CALC)_SRC_PATH)
-DEP_FILES := $(SONIC_COMMON_FILES_LIST) $(PLATFORM_PATH)/sdk.mk $(PLATFORM_PATH)/sdk.dep
-DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST)
-DEP_FILES += $(shell git ls-files -- $(SPATH))
-
-$(SX_HASH_CALC)_CACHE_MODE := GIT_CONTENT_SHA
-$(SX_HASH_CALC)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
-$(SX_HASH_CALC)_DEP_FILES := $(DEP_FILES)
-
-ifeq ($(SDK_FROM_SRC),y)
-$(SX_HASH_CALC_DBGSYM)_CACHE_MODE := GIT_CONTENT_SHA
-$(SX_HASH_CALC_DBGSYM)_DEP_FLAGS := $(MLNX_SDK_COMMON_FLAGS_LIST)
-$(SX_HASH_CALC_DBGSYM)_DEP_FILES := $(DEP_FILES)
-endif
-
 # SX_KERNEL
 
 SPATH := $($(SX_KERNEL)_SRC_PATH)
diff --git a/platform/mellanox/sdk.mk b/platform/mellanox/sdk.mk
index 8a22444e448..171c7d748d7 100644
--- a/platform/mellanox/sdk.mk
+++ b/platform/mellanox/sdk.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016-2022 NVIDIA CORPORATION & AFFILIATES.
+# Copyright (c) 2016-2023 NVIDIA CORPORATION & AFFILIATES.
 # Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -34,121 +34,20 @@ endif
 
 export MLNX_SDK_SOURCE_BASE_URL MLNX_SDK_VERSION MLNX_SDK_ISSU_VERSION MLNX_SDK_DEB_VERSION MLNX_ASSETS_GITHUB_URL MLNX_SDK_DRIVERS_GITHUB_URL
 
-MLNX_SDK_RDEBS += $(APPLIBS) $(SX_COMPLIB) $(SX_EXAMPLES) \
-                  $(SX_GEN_UTILS) $(SX_SCEW) $(SXD_LIBS) $(WJH_LIBS) $(SX_ACL_HELPER) \
-                  $(SX_HASH_CALC)
-
-MLNX_SDK_DEBS += $(APPLIBS_DEV) $(SX_COMPLIB_DEV) \
-                 $(SX_COMPLIB_DEV_STATIC) $(SX_EXAMPLES_DEV) $(SX_GEN_UTILS_DEV) \
-                 $(SX_SCEW_DEV) $(SX_SCEW_DEV_STATIC) $(SXD_LIBS_DEV)\
-                 $(SXD_LIBS_DEV_STATIC) $(WJH_LIBS_DEV) $(SX_ACL_HELPER_DEV) $(SX_HASH_CALC)
-
-MLNX_SDK_DBG_DEBS += $(APPLIBS_DBGSYM) $(SX_COMPLIB_DBGSYM) \
-         $(SX_EXAMPLES_DBGSYM) $(SX_GEN_UTILS_DBGSYM) $(SX_SCEW_DBGSYM) \
-         $(SXD_LIBS_DBGSYM) $(WJH_LIBS_DBGSYM) $(SX_ACL_HELPER_DBGSYM) \
-         $(SX_HASH_CALC_DBGSYM)
-
-APPLIBS = applibs_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb
-$(APPLIBS)_SRC_PATH = $(PLATFORM_PATH)/sdk-src/applibs
-$(APPLIBS)_DEPENDS += $(SX_COMPLIB_DEV) $(SX_GEN_UTILS_DEV) $(SXD_LIBS_DEV) $(LIBNL3_DEV) $(LIBNL_GENL3_DEV)
-$(APPLIBS)_RDEPENDS += $(SX_COMPLIB) $(SX_GEN_UTILS) $(SXD_LIBS) $(LIBNL3) $(LIBNL_GENL3)
-APPLIBS_DEV = applibs-dev_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb
-$(eval $(call add_derived_package,$(APPLIBS),$(APPLIBS_DEV)))
-APPLIBS_DBGSYM = applibs-dbgsym_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb
-ifeq ($(SDK_FROM_SRC),y)
-$(eval $(call add_derived_package,$(APPLIBS),$(APPLIBS_DBGSYM)))
-endif
-
-SX_COMPLIB = sx-complib_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb
-$(SX_COMPLIB)_SRC_PATH = $(PLATFORM_PATH)/sdk-src/sx-complib
-SX_COMPLIB_DEV = sx-complib-dev_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb
-$(eval $(call add_derived_package,$(SX_COMPLIB),$(SX_COMPLIB_DEV)))
-SX_COMPLIB_DBGSYM = sx-complib-dbgsym_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb
-ifeq ($(SDK_FROM_SRC),y)
-$(eval $(call add_derived_package,$(SX_COMPLIB),$(SX_COMPLIB_DBGSYM)))
-endif
-
-SX_EXAMPLES = sx-examples_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb
-$(SX_EXAMPLES)_SRC_PATH = $(PLATFORM_PATH)/sdk-src/sx-examples
-$(SX_EXAMPLES)_DEPENDS += $(APPLIBS_DEV) $(SX_SCEW_DEV) $(SXD_LIBS_DEV)
-$(SX_EXAMPLES)_RDEPENDS += $(APPLIBS) $(SX_SCEW) $(SXD_LIBS)
-SX_EXAMPLES_DEV = sx-examples-dev_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb
-$(eval $(call add_derived_package,$(SX_EXAMPLES),$(SX_EXAMPLES_DEV)))
-SX_EXAMPLES_DBGSYM = sx-examples-dbgsym_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb
-ifeq ($(SDK_FROM_SRC),y)
-$(eval $(call add_derived_package,$(SX_EXAMPLES),$(SX_EXAMPLES_DBGSYM)))
-endif
+MLNX_SDK_RDEBS += $(SYSSDK)
 
-SX_GEN_UTILS = sx-gen-utils_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb
-$(SX_GEN_UTILS)_SRC_PATH += $(PLATFORM_PATH)/sdk-src/sx-gen-utils
-$(SX_GEN_UTILS)_DEPENDS += $(SX_COMPLIB_DEV)
-$(SX_GEN_UTILS)_RDEPENDS += $(SX_COMPLIB)
-SX_GEN_UTILS_DEV = sx-gen-utils-dev_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb
-$(eval $(call add_derived_package,$(SX_GEN_UTILS),$(SX_GEN_UTILS_DEV)))
-SX_GEN_UTILS_DBGSYM = sx-gen-utils-dbgsym_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb
-ifeq ($(SDK_FROM_SRC),y)
-$(eval $(call add_derived_package,$(SX_GEN_UTILS),$(SX_GEN_UTILS_DBGSYM)))
-endif
+MLNX_SDK_DEBS += $(SYSSDK)
 
-SX_SCEW = sx-scew_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb
-$(SX_SCEW)_SRC_PATH = $(PLATFORM_PATH)/sdk-src/sx-scew
-SX_SCEW_DEV = sx-scew-dev_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb
-$(eval $(call add_derived_package,$(SX_SCEW),$(SX_SCEW_DEV)))
-SX_SCEW_DBGSYM = sx-scew-dbgsym_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb
-ifeq ($(SDK_FROM_SRC),y)
-$(eval $(call add_derived_package,$(SX_SCEW),$(SX_SCEW_DBGSYM)))
-endif
 
-SXD_LIBS = sxd-libs_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb
-$(SXD_LIBS)_SRC_PATH = $(PLATFORM_PATH)/sdk-src/sxd-libs
-$(SXD_LIBS)_DEPENDS += $(SX_COMPLIB_DEV) $(SX_GEN_UTILS_DEV)
-SXD_LIBS_DEV = sxd-libs-dev_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb
-$(eval $(call add_derived_package,$(SXD_LIBS),$(SXD_LIBS_DEV)))
-SXD_LIBS_DBGSYM = sxd-libs-dbgsym_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb
+SYSSDK = sys-sdk_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb
+$(SYSSDK)_SRC_PATH = $(PLATFORM_PATH)/sdk-src/sys-sdk
+$(SYSSDK)_DEPENDS += $(LIBNL3_DEV) $(LIBNL_GENL3_DEV)
+$(SYSSDK)_RDEPENDS += $(LIBNL3) $(LIBNL_GENL3)
 ifeq ($(SDK_FROM_SRC),y)
-$(eval $(call add_derived_package,$(SXD_LIBS),$(SXD_LIBS_DBGSYM)))
+$(eval $(call add_derived_package,$(SYSSDK)))
 endif
 
 #packages that are required for runtime only
-PYTHON_SDK_API = python-sdk-api_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb
-$(PYTHON_SDK_API)_SRC_PATH = $(PLATFORM_PATH)/sdk-src/python-sdk-api
-$(PYTHON_SDK_API)_DEPENDS += $(APPLIBS_DEV) $(SXD_LIBS_DEV) $(SWIG)
-$(PYTHON_SDK_API)_RDEPENDS += $(APPLIBS) $(SXD_LIBS)
-PYTHON_SDK_API_DBGSYM = python-sdk-api-dbgsym_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb
-ifeq ($(SDK_FROM_SRC),y)
-$(eval $(call add_derived_package,$(PYTHON_SDK_API),$(PYTHON_SDK_API_DBGSYM)))
-endif
-
-SX_ACL_HELPER = sx-acl-helper_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb
-$(SX_ACL_HELPER)_SRC_PATH = $(PLATFORM_PATH)/sdk-src/sx-acl-helper
-$(SX_ACL_HELPER)_DEPENDS += $(SX_COMPLIB_DEV) $(SXD_LIBS_DEV) $(APPLIBS_DEV)
-$(SX_ACL_HELPER)_RDEPENDS += $(SX_COMPLIB) $(PYTHON_SDK_API)
-SX_ACL_HELPER_DEV = sx-acl-helper-dev_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb
-$(eval $(call add_derived_package,$(SX_ACL_HELPER),$(SX_ACL_HELPER_DEV)))
-SX_ACL_HELPER_DBGSYM = sx-acl-helper-dbgsym_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb
-ifeq ($(SDK_FROM_SRC),y)
-$(eval $(call add_derived_package,$(SX_ACL_HELPER),$(SX_ACL_HELPER_DBGSYM)))
-endif
-
-WJH_LIBS = wjh-libs_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb
-$(WJH_LIBS)_SRC_PATH = $(PLATFORM_PATH)/sdk-src/wjh-libs
-$(WJH_LIBS)_DEPENDS += $(SX_COMPLIB_DEV) $(SXD_LIBS_DEV) $(APPLIBS_DEV) $(SX_ACL_HELPER_DEV) $(SX_SCEW_DEV)
-$(WJH_LIBS)_RDEPENDS += $(SX_COMPLIB) $(PYTHON_SDK_API) $(SX_ACL_HELPER)
-WJH_LIBS_DEV = wjh-libs-dev_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb
-$(eval $(call add_derived_package,$(WJH_LIBS),$(WJH_LIBS_DEV)))
-WJH_LIBS_DBGSYM = wjh-libs-dbgsym_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb
-ifeq ($(SDK_FROM_SRC),y)
-$(eval $(call add_derived_package,$(WJH_LIBS),$(WJH_LIBS_DBGSYM)))
-endif
-
-SX_HASH_CALC = sx-hash-calc_1.mlnx.$(MLNX_SDK_DEB_VERSION)_amd64.deb
-$(SX_HASH_CALC)_SRC_PATH = $(PLATFORM_PATH)/sdk-src/sx-hash-calc
-$(SX_HASH_CALC)_DEPENDS += $(SX_COMPLIB_DEV) $(SXD_LIBS_DEV) $(APPLIBS_DEV) $(SX_GEN_UTILS_DEV)
-$(SX_HASH_CALC)_RDEPENDS += $(SX_COMPLIB) $(SXD_LIBS) $(APPLIBS)
-SX_HASH_CALC_DBGSYM = sx-hash-calc-dbgsym_1.mlnx.$(MLNX_SDK_DEB_VERSION)_amd64.deb
-ifeq ($(SDK_FROM_SRC),y)
-$(eval $(call add_derived_package,$(SX_HASH_CALC),$(SX_HASH_CALC_DBGSYM)))
-endif
 
 SX_KERNEL = sx-kernel_1.mlnx.$(MLNX_SDK_DEB_VERSION)_$(CONFIGURED_ARCH).deb
 $(SX_KERNEL)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON)
@@ -163,7 +62,7 @@ endef
 
 $(eval $(foreach deb,$(MLNX_SDK_DEBS) $(MLNX_SDK_RDEBS) $(PYTHON_SDK_API),$(call make_url,$(deb))))
 
-SONIC_MAKE_DEBS += $(SX_KERNEL)
+SONIC_MAKE_DEBS += $(SYSSDK)
 
 ifeq ($(SDK_FROM_SRC), y)
 SONIC_MAKE_DEBS += $(MLNX_SDK_RDEBS) $(PYTHON_SDK_API)