diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
index 164ec5ba32..c916e7c0a2 100644
--- a/files/build_templates/sonic_debian_extension.j2
+++ b/files/build_templates/sonic_debian_extension.j2
@@ -829,7 +829,7 @@ sudo mkdir -p $FILESYSTEM_ROOT/etc/mlnx/
 sudo cp $files_path/$MLNX_SPC_FW_FILE $FILESYSTEM_ROOT/etc/mlnx/fw-SPC.mfa
 sudo cp $files_path/$MLNX_SPC2_FW_FILE $FILESYSTEM_ROOT/etc/mlnx/fw-SPC2.mfa
 sudo cp $files_path/$MLNX_SPC3_FW_FILE $FILESYSTEM_ROOT/etc/mlnx/fw-SPC3.mfa
-sudo cp $files_path/$ISSU_VERSION_FILE $FILESYSTEM_ROOT/etc/mlnx/issu-version
+#sudo cp $files_path/$ISSU_VERSION_FILE $FILESYSTEM_ROOT/etc/mlnx/issu-version
 sudo cp $files_path/$MLNX_FFB_SCRIPT $FILESYSTEM_ROOT/usr/bin/mlnx-ffb.sh
 sudo cp $files_path/$MLNX_ONIE_FW_UPDATE $FILESYSTEM_ROOT/usr/bin/$MLNX_ONIE_FW_UPDATE
 sudo cp $files_path/$MLNX_SSD_FW_UPDATE $FILESYSTEM_ROOT/usr/bin/$MLNX_SSD_FW_UPDATE
diff --git a/platform/mellanox/docker-saiserver-mlnx.mk b/platform/mellanox/docker-saiserver-mlnx.mk
index 4d49b337e7..da74234bbf 100644
--- a/platform/mellanox/docker-saiserver-mlnx.mk
+++ b/platform/mellanox/docker-saiserver-mlnx.mk
@@ -29,3 +29,5 @@ $(DOCKER_SAISERVER_MLNX)_RUN_OPT += --privileged -t
 $(DOCKER_SAISERVER_MLNX)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
 $(DOCKER_SAISERVER_MLNX)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
 $(DOCKER_SYNCD_BASE)_RUN_OPT += --tmpfs /run/criu
+
+SONIC_BUSTER_DOCKERS += $(DOCKER_SAISERVER_MLNX)
diff --git a/platform/mellanox/docker-syncd-mlnx-rpc.mk b/platform/mellanox/docker-syncd-mlnx-rpc.mk
index 642be88dee..fb740cdee4 100644
--- a/platform/mellanox/docker-syncd-mlnx-rpc.mk
+++ b/platform/mellanox/docker-syncd-mlnx-rpc.mk
@@ -42,3 +42,5 @@ $(DOCKER_SYNCD_MLNX_RPC)_RUN_OPT += --privileged -t
 $(DOCKER_SYNCD_MLNX_RPC)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
 $(DOCKER_SYNCD_MLNX_RPC)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
 $(DOCKER_SYNCD_MLNX_RPC)_RUN_OPT += -v /host/warmboot:/var/warmboot
+
+SONIC_BUSTER_DOCKERS += $(DOCKER_SYNCD_MLNX_RPC)
diff --git a/platform/mellanox/issu-version.mk b/platform/mellanox/issu-version.mk
index 21e8d94a22..51a6152495 100644
--- a/platform/mellanox/issu-version.mk
+++ b/platform/mellanox/issu-version.mk
@@ -21,6 +21,9 @@ $(ISSU_VERSION_FILE)_SRC_PATH = $(PLATFORM_PATH)/issu-version
 $(ISSU_VERSION_FILE)_DEPENDS += $(APPLIBS)
 SONIC_MAKE_FILES += $(ISSU_VERSION_FILE)
 
-MLNX_FILES += $(ISSU_VERSION_FILE)
+# TODO: Disable because the base OS version (bullseye) doesn't match what the
+# SDK app packages are built for (buster), and this target assumes that they
+# are available.
+#MLNX_FILES += $(ISSU_VERSION_FILE)
 
 export ISSU_VERSION_FILE
diff --git a/platform/mellanox/mft.mk b/platform/mellanox/mft.mk
index 01af61e6f6..7cc1fda6e1 100644
--- a/platform/mellanox/mft.mk
+++ b/platform/mellanox/mft.mk
@@ -23,11 +23,15 @@ export MFT_VERSION MFT_REVISION
 
 MFT = mft_$(MFT_VERSION)-$(MFT_REVISION)_amd64.deb
 $(MFT)_SRC_PATH = $(PLATFORM_PATH)/mft
+ifeq ($(DISTRO), bullseye)
 $(MFT)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON)
+endif
 SONIC_MAKE_DEBS += $(MFT)
 
+ifeq ($(DISTRO), bullseye)
 KERNEL_MFT = kernel-mft-dkms-modules-$(KVERSION)_$(MFT_VERSION)_amd64.deb
 $(eval $(call add_derived_package,$(MFT),$(KERNEL_MFT)))
+endif
 
 MFT_OEM = mft-oem_$(MFT_VERSION)-$(MFT_REVISION)_amd64.deb
 $(eval $(call add_derived_package,$(MFT),$(MFT_OEM)))
diff --git a/platform/mellanox/mft/Makefile b/platform/mellanox/mft/Makefile
index 755ef4afc2..c1798dcc76 100644
--- a/platform/mellanox/mft/Makefile
+++ b/platform/mellanox/mft/Makefile
@@ -35,6 +35,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	wget -O $(MFT_TGZ) http://www.mellanox.com/downloads/MFT/$(MFT_TGZ)
 	tar xzf $(MFT_TGZ)
 
+ifeq ($(DISTRO), bullseye)
 	pushd $(MFT_NAME)/SDEBS
 
 	# put a lock here because dpkg does not allow installing packages in parallel
@@ -62,6 +63,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	popd
 
 	rm -rf $(DKMS_TMP)
+endif
 
 	# fix timestamp because we do not actually build tools, only kernel
 	touch $(MFT_NAME)/DEBS/*.deb