diff --git a/platform/nvidia-bluefield/gpio-mlxbf/.gitignore b/platform/nvidia-bluefield/gpio-mlxbf/.gitignore
deleted file mode 100644
index a0991ff4402b..000000000000
--- a/platform/nvidia-bluefield/gpio-mlxbf/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*
-!.gitignore
-!Makefile
diff --git a/platform/nvidia-bluefield/gpio-mlxbf/Makefile b/platform/nvidia-bluefield/gpio-mlxbf/Makefile
deleted file mode 100644
index 53a6262f0f07..000000000000
--- a/platform/nvidia-bluefield/gpio-mlxbf/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES.
-# Apache-2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-.ONESHELL:
-SHELL = /bin/bash
-.SHELLFLAGS += -ex
-
-MLXBF_GPIO = gpio-mlxbf-${MLXBF_GPIO_DRIVER_VERSION}
-MLXBF_GPIO_TAR = ${MLXBF_GPIO}.tar.gz
-MODULE_DIR := $(shell pwd)/${MLXBF_GPIO}
-
-$(addprefix $(DEST)/, $(MLXBF_GPIO_DRIVER)): $(DEST)/% :
-	rm -rf ./gpio-mlxbf-$(MLXBF_GPIO_DRIVER_VERSION)
-	wget -N "https://linux.mellanox.com/public/repo/bluefield/${BSD_VER}/extras/SOURCES/$(MLXBF_GPIO_TAR)"
-	tar -z -f $(MLXBF_GPIO_TAR) -x
-
-	pushd ${MLXBF_GPIO}
-
-	# Build the package
-ifeq ($(CROSS_BUILD_ENVIRON), y)
-	make -C /lib/modules/$(KVERSION)/build ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- M=$(MODULE_DIR)
-else
-	make -C /lib/modules/$(KVERSION)/build M=$(MODULE_DIR)
-endif
-	
-
-	mv ${MLXBF_GPIO_DRIVER} $(DEST)/
-	popd
diff --git a/platform/nvidia-bluefield/mft/Makefile b/platform/nvidia-bluefield/mft/Makefile
index d07d85098ee8..2f070089aebc 100644
--- a/platform/nvidia-bluefield/mft/Makefile
+++ b/platform/nvidia-bluefield/mft/Makefile
@@ -21,8 +21,9 @@ SHELL = /bin/bash
 MFT_NAME = mft-$(MFT_VERSION)-$(MFT_REVISION)-arm64-deb
 MFT_TGZ = $(MFT_NAME).tgz
 
+BUILD_ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 SRC_DEB = kernel-mft-dkms_$(MFT_VERSION)-$(MFT_REVISION)_all.deb
-MOD_DEB = kernel-mft-dkms-modules-$(KVERSION)_$(MFT_VERSION)_arm64.deb
+MOD_DEB = kernel-mft-dkms-modules-$(KVERSION)_$(MFT_VERSION)_$(BUILD_ARCH).deb
 
 MAIN_TARGET = mft_$(MFT_VERSION)-$(MFT_REVISION)_arm64.deb
 DERIVED_TARGETS = $(MOD_DEB) mft-oem_$(MFT_VERSION)-$(MFT_REVISION)_arm64.deb
diff --git a/platform/nvidia-bluefield/mlx-cpld/.gitignore b/platform/nvidia-bluefield/mlx-cpld/.gitignore
deleted file mode 100644
index 4ccfa41db02a..000000000000
--- a/platform/nvidia-bluefield/mlx-cpld/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-
-*
-!.gitignore
-!Makefile
diff --git a/platform/nvidia-bluefield/mlx-cpld/Makefile b/platform/nvidia-bluefield/mlx-cpld/Makefile
deleted file mode 100644
index 910756a47d11..000000000000
--- a/platform/nvidia-bluefield/mlx-cpld/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES.
-# Apache-2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-.ONESHELL:
-SHELL = /bin/bash
-.SHELLFLAGS += -ex
-
-MLX_CPLD = mlx-cpld-${MLX_CPLD_DRIVER_VERSION}
-MLX_CPLD_TAR = ${MLX_CPLD}.tar.gz
-MODULE_DIR := $(shell pwd)/${MLX_CPLD}
-
-$(addprefix $(DEST)/, $(MLX_CPLD_DRIVER)): $(DEST)/% :
-	rm -rf ${MLX_CPLD} ${MLX_CPLD_TAR}
-	wget -N "https://linux.mellanox.com/public/repo/bluefield/${BSD_VER}/extras/SOURCES/$(MLX_CPLD_TAR)"
-	tar -z -f $(MLX_CPLD_TAR) -x
-
-	pushd ${MLX_CPLD}
-
-	# Build the package
-ifeq ($(CROSS_BUILD_ENVIRON), y)
-	make -C /lib/modules/$(KVERSION)/build ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- M=$(MODULE_DIR)
-else
-	make -C /lib/modules/$(KVERSION)/build M=$(MODULE_DIR)
-endif
-	mv ${MLX_CPLD_DRIVER} $(DEST)/
-	popd
diff --git a/platform/nvidia-bluefield/mlx-openipmi/Makefile b/platform/nvidia-bluefield/mlx-openipmi/Makefile
index 6853868f0bbb..4c3b306e85f7 100644
--- a/platform/nvidia-bluefield/mlx-openipmi/Makefile
+++ b/platform/nvidia-bluefield/mlx-openipmi/Makefile
@@ -22,7 +22,10 @@ SHELL = /bin/bash
 MLX_OPENIPMI = mlx-OpenIPMI-${MLX_OPENIPMI_DRIVER_VERSION}
 MLX_OPENIPMI_TAR = ${MLX_OPENIPMI}.tar.gz
 
-$(addprefix $(DEST)/, $(MLX_OPENIPMI_DEB)): $(DEST)/% :
+MAIN_TARGET = $(MLX_OPENIPMI_DEB)
+DERIVED_TARGETS = $(MLX_OPENIPMI_SERVER_DEB)
+
+$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	rm -rf ${MLX_OPENIPMI} ${MLX_OPENIPMI_TAR} *.buildinfo *.changes *.deb
 	wget -N "https://linux.mellanox.com/public/repo/bluefield/${BSD_VER}/extras/SOURCES/$(MLX_OPENIPMI_TAR)"
 	tar -z -f $(MLX_OPENIPMI_TAR) -x
@@ -31,10 +34,12 @@ $(addprefix $(DEST)/, $(MLX_OPENIPMI_DEB)): $(DEST)/% :
 
 	# Build the package
 ifeq ($(CROSS_BUILD_ENVIRON), y)	
-	CONFIG_SITE=/etc/dpkg-cross/cross-config.$(CONFIGURED_ARCH) LD_LIBRARY_PATH=$(CROSS_LIB_PATH) dpkg-buildpackage -rfakeroot -us -uc -b -a$(CONFIGURED_ARCH) -Pcross,nocheck -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
+	dpkg-buildpackage -rfakeroot -us -uc -b -d -a$(CONFIGURED_ARCH) -Pcross,nocheck -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
 else
-	DEB_BUILD_OPTIONS=nocheck dpkg-buildpackage -rfakeroot -us -uc -b -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
+	DEB_BUILD_OPTIONS=nocheck dpkg-buildpackage -rfakeroot -us -uc -b -d -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
 endif
 	popd
 
 	mv $* $(DEST)/
+
+$(addprefix $(DEST)/, $(DERIVED_TARGETS)): $(DEST)/% : $(DEST)/$(MAIN_TARGET)
\ No newline at end of file
diff --git a/platform/nvidia-bluefield/recipes/gpio-mlxbf.dep b/platform/nvidia-bluefield/recipes/gpio-mlxbf.dep
deleted file mode 100644
index 80138f95c8f8..000000000000
--- a/platform/nvidia-bluefield/recipes/gpio-mlxbf.dep
+++ /dev/null
@@ -1,9 +0,0 @@
-
-SPATH       := $($(BLUEFIELD_EDAC_DEB)_SRC_PATH)
-DEP_FILES   := $(SONIC_COMMON_FILES_LIST) rules/gpio-mlxbf.mk rules/gpio-mlxbf.dep
-DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
-DEP_FILES   += $(shell git ls-files $(SPATH))
-
-$(BLUEFIELD_EDAC_DEB)_CACHE_MODE  := GIT_CONTENT_SHA
-$(BLUEFIELD_EDAC_DEB)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST)
-$(BLUEFIELD_EDAC_DEB)_DEP_FILES   := $(DEP_FILES)
\ No newline at end of file
diff --git a/platform/nvidia-bluefield/recipes/gpio-mlxbf.mk b/platform/nvidia-bluefield/recipes/gpio-mlxbf.mk
deleted file mode 100644
index 5e9ca6851643..000000000000
--- a/platform/nvidia-bluefield/recipes/gpio-mlxbf.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES.
-# Apache-2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-MLXBF_GPIO_DRIVER_VERSION = 1.0
-export MLXBF_GPIO_DRIVER_VERSION
-
-MLXBF_GPIO_DRIVER = gpio-mlxbf.ko
-export MLXBF_GPIO_DRIVER
-$(MLXBF_GPIO_DRIVER)_SRC_PATH = $(PLATFORM_PATH)/gpio-mlxbf
-$(MLXBF_GPIO_DRIVER)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON)
-SONIC_MAKE_FILES += $(MLXBF_GPIO_DRIVER)
diff --git a/platform/nvidia-bluefield/recipes/installer-image.mk b/platform/nvidia-bluefield/recipes/installer-image.mk
index f4ecd25100d1..2bf5a1fdc1c7 100644
--- a/platform/nvidia-bluefield/recipes/installer-image.mk
+++ b/platform/nvidia-bluefield/recipes/installer-image.mk
@@ -21,14 +21,19 @@ SONIC_BF2_IMAGE_BASE = sonic-nvidia-bluefield
 $(SONIC_BF2_IMAGE_BASE)_MACHINE = nvidia-bluefield
 
 # Install the packages during the build_debian phase
-$(SONIC_BF2_IMAGE_BASE)_INSTALLS += $(ETHTOOL) $(LIBPKA_DEB) $(SYSTEMD_SONIC_GENERATOR) $(KERNEL_MFT) $(MFT_OEM) $(MFT)
+$(SONIC_BF2_IMAGE_BASE)_INSTALLS += $(ETHTOOL) \
+                                    $(LIBPKA_DEB) \
+                                    $(KERNEL_MFT) \
+                                    $(MFT_OEM) \
+                                    $(MFT) \
+                                    $(MLX_OPENIPMI_DEB) \
+                                    $(MLX_OPENIPMI_SERVER_DEB) \
+                                    $(BF2_PLATFORM_MODULE)
 
 # Required Dockers
 # TODO: Add swss, syncd and pmon later
 $(SONIC_BF2_IMAGE_BASE)_DOCKERS = $(filter-out $(DOCKER_ORCHAGENT) $(DOCKER_PLATFORM_MONITOR),$(SONIC_INSTALL_DOCKER_IMAGES))
 
-# Platform Specific Packages
-$(SONIC_BF2_IMAGE_BASE)_LAZY_INSTALLS += $(BF2_PLATFORM_MODULE)
 
 # TODO:
 # INSTALLS: $(MLNX_BLUEFIELD_BUILD_SCRIPTS) $(MLXBF_BOOTCTL_DEB)
@@ -62,6 +67,4 @@ $(SONIC_BF2_IMAGE_BFB)_DEPENDS += $($(SONIC_BF2_IMAGE_BASE)_DEPENDS)
 $(SONIC_BF2_IMAGE_BFB)_DOCKERS += $($(SONIC_BF2_IMAGE_BASE)_DOCKERS)
 $(SONIC_BF2_IMAGE_BFB)_LAZY_INSTALLS += $($(SONIC_BF2_IMAGE_BASE)_LAZY_INSTALLS)
 
-SONIC_INSTALLERS += $(SONIC_BF2_IMAGE_PXE)
-SONIC_INSTALLERS += $(SONIC_BF2_IMAGE_BIN)
-SONIC_INSTALLERS += $(SONIC_BF2_IMAGE_BFB)
+SONIC_INSTALLERS += $(SONIC_BF2_IMAGE_PXE) $(SONIC_BF2_IMAGE_BIN) $(SONIC_BF2_IMAGE_BFB)
diff --git a/platform/nvidia-bluefield/recipes/mft.mk b/platform/nvidia-bluefield/recipes/mft.mk
index 71dde585ec30..aec3b43cd161 100644
--- a/platform/nvidia-bluefield/recipes/mft.mk
+++ b/platform/nvidia-bluefield/recipes/mft.mk
@@ -26,7 +26,8 @@ SONIC_MAKE_DEBS += $(MFT)
 ifeq ($(BLDENV), bullseye)
 $(MFT)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON)
 
-KERNEL_MFT = kernel-mft-dkms-modules-$(KVERSION)_$(MFT_VERSION)_arm64.deb
+BUILD_ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+KERNEL_MFT = kernel-mft-dkms-modules-$(KVERSION)_$(MFT_VERSION)_$(BUILD_ARCH).deb
 $(eval $(call add_derived_package,$(MFT),$(KERNEL_MFT)))
 endif
 
diff --git a/platform/nvidia-bluefield/recipes/mlx-bootctl.mk b/platform/nvidia-bluefield/recipes/mlx-bootctl.mk
index 9bdc7211d72a..b3543e326e72 100644
--- a/platform/nvidia-bluefield/recipes/mlx-bootctl.mk
+++ b/platform/nvidia-bluefield/recipes/mlx-bootctl.mk
@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-MLX_BOOTCTL_DRIVER_VERSION = 1.3
+MLX_BOOTCTL_DRIVER_VERSION = 1.5
 MLX_BOOTCTL_DRIVER = mlx-bootctl.ko
 
 $(MLX_BOOTCTL_DRIVER)_SRC_PATH = $(PLATFORM_PATH)/mlx-bootctl
diff --git a/platform/nvidia-bluefield/recipes/mlx-cpld.dep b/platform/nvidia-bluefield/recipes/mlx-cpld.dep
deleted file mode 100644
index 4232291daef8..000000000000
--- a/platform/nvidia-bluefield/recipes/mlx-cpld.dep
+++ /dev/null
@@ -1,9 +0,0 @@
-
-SPATH       := $($(MLX_CPLD_DRIVER)_SRC_PATH)
-DEP_FILES   := $(SONIC_COMMON_FILES_LIST) rules/mlx-cpld.mk rules/mlx-cpld.dep
-DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
-DEP_FILES   += $(shell git ls-files $(SPATH))
-
-$(MLX_CPLD_DRIVER)_CACHE_MODE  := GIT_CONTENT_SHA
-$(MLX_CPLD_DRIVER)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST)
-$(MLX_CPLD_DRIVER)_DEP_FILES   := $(DEP_FILES)
\ No newline at end of file
diff --git a/platform/nvidia-bluefield/recipes/mlx-cpld.mk b/platform/nvidia-bluefield/recipes/mlx-cpld.mk
deleted file mode 100644
index 847690807dac..000000000000
--- a/platform/nvidia-bluefield/recipes/mlx-cpld.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES.
-# Apache-2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-MLX_CPLD_DRIVER_VERSION = 1.1
-MLX_CPLD_DRIVER = mlx-cpld.ko
-
-$(MLX_CPLD_DRIVER)_SRC_PATH = $(PLATFORM_PATH)/mlx-cpld
-$(MLX_CPLD_DRIVER)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON)
-SONIC_MAKE_FILES += $(MLX_CPLD_DRIVER)
-
-export MLX_CPLD_DRIVER_VERSION
-export MLX_CPLD_DRIVER
diff --git a/platform/nvidia-bluefield/recipes/mlx-openipmi.mk b/platform/nvidia-bluefield/recipes/mlx-openipmi.mk
index 9a0177b3d9b0..6cdda1bbef9f 100644
--- a/platform/nvidia-bluefield/recipes/mlx-openipmi.mk
+++ b/platform/nvidia-bluefield/recipes/mlx-openipmi.mk
@@ -16,11 +16,15 @@
 #
 
 MLX_OPENIPMI_DRIVER_VERSION = 2.0.25
-MLX_OPENIPMI_DEB = mlx-openipmi_${MLX_OPENIPMI_DRIVER_VERSION}-1_arm64.deb
+MLX_OPENIPMI_DEB = mlx-libopenipmi0_${MLX_OPENIPMI_DRIVER_VERSION}-3_arm64.deb
+MLX_OPENIPMI_SERVER_DEB = mlx-openipmi_${MLX_OPENIPMI_DRIVER_VERSION}-3_arm64.deb
+
 
 $(MLX_OPENIPMI_DEB)_SRC_PATH = $(PLATFORM_PATH)/mlx-openipmi
 $(MLX_OPENIPMI_DEB)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON) libsnmp-dev_$(SNMPD_VERSION_FULL)_$(CONFIGURED_ARCH).deb
 SONIC_MAKE_DEBS += $(MLX_OPENIPMI_DEB)
+$(eval $(call add_derived_package,$(MLX_OPENIPMI_DEB),$(MLX_OPENIPMI_SERVER_DEB)))
 
 export MLX_OPENIPMI_DRIVER_VERSION
 export MLX_OPENIPMI_DEB
+export MLX_OPENIPMI_SERVER_DEB
diff --git a/platform/nvidia-bluefield/recipes/platform-modules-bf2.mk b/platform/nvidia-bluefield/recipes/platform-modules-bf2.mk
index dcbd17593947..886f5e950e1d 100644
--- a/platform/nvidia-bluefield/recipes/platform-modules-bf2.mk
+++ b/platform/nvidia-bluefield/recipes/platform-modules-bf2.mk
@@ -8,12 +8,10 @@ BF2_PLATFORM_MODULE = platform-modules-bf2_$(BF2_PLATFORM_MODULE_VERSION)_arm64.
 $(BF2_PLATFORM_MODULE)_SRC_PATH = $(PLATFORM_PATH)/sonic-platform-modules-bf2
 
 # Bluefield Drivers
-BF2_PLATFORM_DRIVERS = $(MLXBF_GIGE_DRIVER) $(MLXBF2_GPIO_DRIVER) $(BLUEFIELD_EDAC_DRIVER)
-BF2_PLATFORM_DRIVERS += $(MLX_TRIO_DRIVER)  $(MLXBF_LIVEFISH_DRIVER) $(IPMB_HOST_DRIVER)
-BF2_PLATFORM_DRIVERS += $(MLXBF_PKA_DRIVER) $(MLXBF_PMC_DRIVER) $(TMFIFO_DRIVER) 
-BF2_PLATFORM_DRIVERS += $(MLX_BOOTCTL_DRIVER) $(MLXBF_I2C_DRIVER) $(IPMB_DEV_INT_DRIVER)
-
-# $(MLX_CPLD_DRIVER)
+BF2_PLATFORM_DRIVERS = $(MLXBF_GIGE_DRIVER) $(IPMB_HOST_DRIVER) $(MLXBF_I2C_DRIVER)
+BF2_PLATFORM_DRIVERS += $(MLX_TRIO_DRIVER) $(MLXBF_LIVEFISH_DRIVER) $(MLXBF_PMC_DRIVER)
+BF2_PLATFORM_DRIVERS += $(TMFIFO_DRIVER) $(MLXBF2_GPIO_DRIVER) $(BLUEFIELD_EDAC_DRIVER)
+BF2_PLATFORM_DRIVERS += $(MLX_BOOTCTL_DRIVER) $(IPMB_DEV_INT_DRIVER) $(MLXBF_PKA_DRIVER)
 
 $(BF2_PLATFORM_MODULE)_FILES = $(BF2_PLATFORM_DRIVERS)
 $(BF2_PLATFORM_MODULE)_PLATFORM = arm64-nvda_bf-mbf2m516a arm64-nvda_bf-mbf2h536c
diff --git a/platform/nvidia-bluefield/rshim/.gitignore b/platform/nvidia-bluefield/rshim/.gitignore
deleted file mode 100644
index a0991ff4402b..000000000000
--- a/platform/nvidia-bluefield/rshim/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*
-!.gitignore
-!Makefile
diff --git a/platform/nvidia-bluefield/rshim/Makefile b/platform/nvidia-bluefield/rshim/Makefile
deleted file mode 100644
index d4cb73f7eaa5..000000000000
--- a/platform/nvidia-bluefield/rshim/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES.
-# Apache-2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-.ONESHELL:
-SHELL = /bin/bash
-.SHELLFLAGS += -ex
-
-RSHIM = rshim-${RSHIM_DRIVER_VERSION}
-RSHIM_TAR = ${RSHIM}.tar.gz
-
-$(addprefix $(DEST)/, $(RSHIM_DEB)): $(DEST)/% :
-	rm -rf ${RSHIM} ${RSHIM_TAR} *.buildinfo *.changes *.deb
-	wget -N "https://linux.mellanox.com/public/repo/bluefield/${BSD_VER}/extras/SOURCES/$(RSHIM_TAR)"
-	tar -z -f $(RSHIM_TAR) -x
-
-	pushd ${RSHIM}
-
-	# Build the package
-ifeq ($(CROSS_BUILD_ENVIRON), y)
-	CONFIG_SITE=/etc/dpkg-cross/cross-config.$(CONFIGURED_ARCH) LD_LIBRARY_PATH=$(CROSS_LIB_PATH) dpkg-buildpackage -rfakeroot -us -uc -b -a$(CONFIGURED_ARCH) -Pcross,nocheck -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
-else
-	DEB_BUILD_OPTIONS=nocheck dpkg-buildpackage -rfakeroot -us -uc -b -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
-endif
-	popd
-
-	mv $* $(DEST)/
diff --git a/platform/nvidia-bluefield/rules.mk b/platform/nvidia-bluefield/rules.mk
index fd82f332eb41..25b5a32e5e8f 100644
--- a/platform/nvidia-bluefield/rules.mk
+++ b/platform/nvidia-bluefield/rules.mk
@@ -18,20 +18,18 @@
 RECIPE_DIR = recipes
 
 # Bluefied Software Distribution Version
-BSD_VER = "3.7.1"
+BSD_VER=3.8.0
 export BSD_VER
 
+
 include $(PLATFORM_PATH)/$(RECIPE_DIR)/tmfifo.mk
 include $(PLATFORM_PATH)/$(RECIPE_DIR)/mlxbf-gige.mk
-include $(PLATFORM_PATH)/$(RECIPE_DIR)/gpio-mlxbf.mk
 include $(PLATFORM_PATH)/$(RECIPE_DIR)/gpio-mlxbf2.mk
 include $(PLATFORM_PATH)/$(RECIPE_DIR)/i2c-mlxbf.mk
 include $(PLATFORM_PATH)/$(RECIPE_DIR)/bluefield-edac.mk
 include $(PLATFORM_PATH)/$(RECIPE_DIR)/ipmb-dev-int.mk
 include $(PLATFORM_PATH)/$(RECIPE_DIR)/ipmb-host.mk
-include $(PLATFORM_PATH)/$(RECIPE_DIR)/libpka.mk
 include $(PLATFORM_PATH)/$(RECIPE_DIR)/mlx-bootctl.mk
-include $(PLATFORM_PATH)/$(RECIPE_DIR)/mlx-cpld.mk
 include $(PLATFORM_PATH)/$(RECIPE_DIR)/mlx-trio.mk
 include $(PLATFORM_PATH)/$(RECIPE_DIR)/mlxbf-bootctl.mk
 include $(PLATFORM_PATH)/$(RECIPE_DIR)/mlxbf-livefish.mk
@@ -42,8 +40,7 @@ include $(PLATFORM_PATH)/$(RECIPE_DIR)/bootimages.mk
 include $(PLATFORM_PATH)/$(RECIPE_DIR)/bfscripts.mk
 include $(PLATFORM_PATH)/$(RECIPE_DIR)/platform-modules-bf2.mk
 include $(PLATFORM_PATH)/$(RECIPE_DIR)/mft.mk
+include $(PLATFORM_PATH)/$(RECIPE_DIR)/mlx-openipmi.mk
+# include $(PLATFORM_PATH)/$(RECIPE_DIR)/libpka.mk
 include $(PLATFORM_PATH)/$(RECIPE_DIR)/installer-image.mk
 
-# TODO: This deb has dependency issues, skipped for now
-# include $(PLATFORM_PATH)/$(RECIPE_DIR)/mlx-openipmi.mk
-
diff --git a/platform/nvidia-bluefield/sonic-platform-modules-bf2/templates/platform-modules-bf2.postinst.j2 b/platform/nvidia-bluefield/sonic-platform-modules-bf2/templates/platform-modules-bf2.postinst.j2
index a444d0d0d286..a11a4449c682 100644
--- a/platform/nvidia-bluefield/sonic-platform-modules-bf2/templates/platform-modules-bf2.postinst.j2
+++ b/platform/nvidia-bluefield/sonic-platform-modules-bf2/templates/platform-modules-bf2.postinst.j2
@@ -11,10 +11,8 @@ modprobe {{ k_module.split(".")[0] }}
 
 sync
 
-systemctl restart ssh
-systemctl restart systemd-logind
 systemctl enable serial-getty@hvc0.service
 systemctl enable serial-getty@ttyAMA0.service
 systemctl enable serial-getty@ttyAMA1.service
 
-#DEBHELPER#
\ No newline at end of file
+#DEBHELPER#
diff --git a/platform/nvidia-bluefield/sonic-platform-modules-bf2/udev/92-oob_net.rules b/platform/nvidia-bluefield/sonic-platform-modules-bf2/udev/92-oob_net.rules
new file mode 100755
index 000000000000..dd0c47a4fb60
--- /dev/null
+++ b/platform/nvidia-bluefield/sonic-platform-modules-bf2/udev/92-oob_net.rules
@@ -0,0 +1 @@
+SUBSYSTEM=="net", ACTION=="add", DEVPATH=="/devices/platform/MLNXBF17:00/net/e*", NAME="eth0"
diff --git a/sonic-slave-bullseye/Dockerfile.j2 b/sonic-slave-bullseye/Dockerfile.j2
index 8ed4446f0fa7..801e93d4fb90 100644
--- a/sonic-slave-bullseye/Dockerfile.j2
+++ b/sonic-slave-bullseye/Dockerfile.j2
@@ -344,6 +344,9 @@ RUN apt-get update && apt-get install -y \
         googletest \
         libgtest-dev \
         libgcc-10-dev \
+# For mlx-openIPMI
+	libopt0 \
+	libopt-dev \
 # For sonic-host-services build
         libcairo2-dev \
         libdbus-1-dev \