diff --git a/.gitmodules b/.gitmodules
index d02ee6fb94..08546d4607 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -66,3 +66,6 @@
 [submodule "platform/mellanox/mlnx-sai/SAI-Implementation"]
 	path = platform/mellanox/mlnx-sai/SAI-Implementation
 	url = https://github.com/Mellanox/SAI-Implementation
+[submodule "Switch-SDK-drivers"]
+	path = platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
+	url = https://github.com/Mellanox/Switch-SDK-drivers
diff --git a/platform/mellanox/.gitignore b/platform/mellanox/.gitignore
index 74751518db..1f3d15d640 100644
--- a/platform/mellanox/.gitignore
+++ b/platform/mellanox/.gitignore
@@ -8,6 +8,7 @@ mft/*
 !mft/Makefile
 sdk-src/*/*
 !sdk-src/*/Makefile
+!sdk-src/sx-kernel/Switch-SDK-drivers/
 !sdk-src/*/*.patch
 */build
 */deb_dist
diff --git a/platform/mellanox/fw.mk b/platform/mellanox/fw.mk
index 6e9a285cc1..0ad1b05137 100644
--- a/platform/mellanox/fw.mk
+++ b/platform/mellanox/fw.mk
@@ -1,16 +1,32 @@
 # mellanox firmware
 
-MLNX_FW_BASE_URL = $(MLNX_SDK_BASE_URL)
+MLNX_FW_BASE_PATH = $(MLNX_SDK_BASE_PATH)
+
+# Place an URL here to FW if you want to download FW instead
+MLNX_FW_BASE_URL =
+
+ifneq ($(MLNX_FW_BASE_URL), )
+FW_FROM_URL = y
+else
+FW_FROM_URL = n
+endif
+
 
 MLNX_SPC_FW_VERSION = 13.2000.2162
 MLNX_SPC_FW_FILE = fw-SPC-rel-$(subst .,_,$(MLNX_SPC_FW_VERSION))-EVB.mfa
+$(MLNX_SPC_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC_FW_FILE)
-SONIC_ONLINE_FILES += $(MLNX_SPC_FW_FILE)
 
 MLNX_SPC2_FW_VERSION = 29.2000.2162
 MLNX_SPC2_FW_FILE = fw-SPC2-rel-$(subst .,_,$(MLNX_SPC2_FW_VERSION))-EVB.mfa
+$(MLNX_SPC2_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
 $(MLNX_SPC2_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC2_FW_FILE)
-SONIC_ONLINE_FILES += $(MLNX_SPC2_FW_FILE)
+
+ifeq ($(FW_FROM_URL),n)
+SONIC_COPY_FILES += $(MLNX_SPC_FW_FILE) $(MLNX_SPC2_FW_FILE)
+else
+SONIC_ONLINE_FILES += $(MLNX_SPC_FW_FILE) $(MLNX_SPC2_FW_FILE)
+endif
 
 export MLNX_SPC_FW_VERSION
 export MLNX_SPC_FW_FILE
diff --git a/platform/mellanox/sdk-src/sx-kernel/Makefile b/platform/mellanox/sdk-src/sx-kernel/Makefile
index 35ce9432a3..9e979879fe 100644
--- a/platform/mellanox/sdk-src/sx-kernel/Makefile
+++ b/platform/mellanox/sdk-src/sx-kernel/Makefile
@@ -7,12 +7,18 @@ PACKAGE_NAME = sx_kernel
 
 $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	# get sources
-	rm -rf sx_kernel-$(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
+	if [ ! -z "$(MLNX_SDK_SOURCE_BASE_URL)" ]; then
+		rm -rf sx_kernel-$(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
+		pushd sx_kernel-$(MLNX_SDK_VERSION)-$(MLNX_SDK_ISSU_VERSION)
+	else
+		pushd Switch-SDK-drivers
+		git reset --hard
+		git clean -xfd
+	fi
 
 	# build
-	pushd sx_kernel-$(MLNX_SDK_VERSION)-$(MLNX_SDK_ISSU_VERSION)
 	patch -p1 < ../sx_kernel_makefile_sonic_build.patch
 
 	debuild -e KVERSION=$(KVERSION) -e KSRC_EXT=/lib/modules/$(KVERSION)/source/ -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS)
diff --git a/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers b/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
new file mode 160000
index 0000000000..3acd88b3e0
--- /dev/null
+++ b/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
@@ -0,0 +1 @@
+Subproject commit 3acd88b3e04ec09e5fb7e2b74ed94540a9fea21e
diff --git a/platform/mellanox/sdk.mk b/platform/mellanox/sdk.mk
index 3cf3ee3ff9..779e072e36 100644
--- a/platform/mellanox/sdk.mk
+++ b/platform/mellanox/sdk.mk
@@ -1,4 +1,4 @@
-MLNX_SDK_BASE_URL = https://github.com/Mellanox/SAI-Implementation/raw/350187a41e408daaf03380401a0a2351b6cb0f9e/sdk
+MLNX_SDK_BASE_PATH = $(PLATFORM_PATH)/sdk-src/sx-kernel/Switch-SDK-drivers/bin/
 MLNX_SDK_VERSION = 4.3.2104
 MLNX_SDK_ISSU_VERSION = 101
 
@@ -135,19 +135,21 @@ $(SX_KERNEL)_SRC_PATH = $(PLATFORM_PATH)/sdk-src/sx-kernel
 SX_KERNEL_DEV = sx-kernel-dev_1.mlnx.$(MLNX_SDK_DEB_VERSION)_amd64.deb
 $(eval $(call add_derived_package,$(SX_KERNEL),$(SX_KERNEL_DEV)))
 
-define make_url
-	$(1)_URL = $(MLNX_SDK_BASE_URL)/$(1)
+define make_path
+	$(1)_PATH = $(MLNX_SDK_BASE_PATH)
 
 endef
 
-$(eval $(foreach deb,$(MLNX_SDK_DEBS),$(call make_url,$(deb))))
-$(eval $(foreach deb,$(MLNX_SDK_RDEBS),$(call make_url,$(deb))))
-$(eval $(foreach deb,$(PYTHON_SDK_API) $(SX_KERNEL) $(SX_KERNEL_DEV),$(call make_url,$(deb))))
+$(eval $(foreach deb,$(MLNX_SDK_DEBS),$(call make_path,$(deb))))
+$(eval $(foreach deb,$(MLNX_SDK_RDEBS),$(call make_path,$(deb))))
+$(eval $(foreach deb,$(PYTHON_SDK_API) $(SX_KERNEL) $(SX_KERNEL_DEV),$(call make_path,$(deb))))
+
+SONIC_MAKE_DEBS += $(SX_KERNEL)
 
 ifeq ($(SDK_FROM_SRC), y)
-SONIC_MAKE_DEBS += $(MLNX_SDK_RDEBS) $(PYTHON_SDK_API) $(SX_KERNEL)
+SONIC_MAKE_DEBS += $(MLNX_SDK_RDEBS) $(PYTHON_SDK_API)
 else
-SONIC_ONLINE_DEBS += $(MLNX_SDK_RDEBS) $(PYTHON_SDK_API) $(SX_KERNEL)
+SONIC_COPY_DEBS += $(MLNX_SDK_RDEBS) $(PYTHON_SDK_API)
 endif
 
 SONIC_STRETCH_DEBS += $(SX_KERNEL)