diff --git a/firmware/bootloader/Makefile b/firmware/bootloader/Makefile
index c7f22b4c9d..17af11fcef 100644
--- a/firmware/bootloader/Makefile
+++ b/firmware/bootloader/Makefile
@@ -169,6 +169,10 @@ include $(PROJECT_DIR)/controllers/controllers.mk
 include $(PROJECT_DIR)/hw_layer/$(CPU_HWLAYER)/hw_ports.mk
 include $(PROJECT_DIR)/hw_layer/drivers/drivers.mk
 
+OPENBLT_TRGT_DIR = $(PROJECT_DIR)/ext/openblt/Target
+-include $(PROJECT_DIR)/hw_layer/$(CPU_HWLAYER)/openblt/port.mk
+
+
 # C sources that can be compiled in ARM or THUMB mode depending on the global
 # setting.
 CSRC =  $(ALLCSRC) \
diff --git a/firmware/hw_layer/ports/stm32/stm32f4/openblt/port.mk b/firmware/hw_layer/ports/stm32/stm32f4/openblt/port.mk
index 532ba954b0..9461432465 100644
--- a/firmware/hw_layer/ports/stm32/stm32f4/openblt/port.mk
+++ b/firmware/hw_layer/ports/stm32/stm32f4/openblt/port.mk
@@ -3,12 +3,12 @@
 #|--------------------------------------------------------------------------------------|
 # Collect all application files in the current directory and its subdirectories, but 
 # exclude flash-layout.c as this one is directly included in a source file, when used.
-PROJ_FILES += $(filter-out $(OPENBLT_PORT_DIR)/flash_layout.c, $(call rwildcard, $(OPENBLT_PORT_DIR), *.c *.h *.s))
+#PROJ_FILES += $(filter-out $(OPENBLT_PORT_DIR)/flash_layout.c, $(call rwildcard, $(OPENBLT_PORT_DIR), *.c *.h *.s))
 # reuse ST32F4xx HAL and CMSIS from one of OpenBLT examples to avoid having copy in rusEFI git
-PROJ_FILES += $(filter-out uip, $(call rwildcard, $(OPENBLT_TRGT_DIR)/Demo/ARMCM4_STM32F4_Nucleo_F429ZI_GCC/Boot/lib/CMSIS/, *.c *.h *.s))
-PROJ_FILES += $(filter-out uip, $(call rwildcard, $(OPENBLT_TRGT_DIR)/Demo/ARMCM4_STM32F4_Nucleo_F429ZI_GCC/Boot/lib/STM32F4xx_HAL_Driver/, *.c *.h *.s))
+PROJ_FILES += $(filter-out uip, $(call rwildcard, $(OPENBLT_TRGT_DIR)/Source/ARMCM4_STM32F4/, *.c *.h *.s))
+PROJ_FILES += $(filter-out uip, $(call rwildcard, $(OPENBLT_TRGT_DIR)/Source/ARMCM4_STM32F4/GCC/, *.c *.h *.s))
 
 #|--------------------------------------------------------------------------------------|
 #| Options for toolchain binaries                                                       |
 #|--------------------------------------------------------------------------------------|
-BRDFLAGS     = -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER
+#BRDFLAGS     = -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER
diff --git a/firmware/hw_layer/ports/stm32/stm32f7/openblt/port.mk b/firmware/hw_layer/ports/stm32/stm32f7/openblt/port.mk
index 333a50e3b3..38cf697b3d 100644
--- a/firmware/hw_layer/ports/stm32/stm32f7/openblt/port.mk
+++ b/firmware/hw_layer/ports/stm32/stm32f7/openblt/port.mk
@@ -3,13 +3,13 @@
 #|--------------------------------------------------------------------------------------|
 # Collect all application files in the current directory and its subdirectories, but 
 # exclude flash-layout.c as this one is directly included in a source file, when used.
-PROJ_FILES += $(filter-out $(OPENBLT_PORT_DIR)/flash_layout.c, $(call rwildcard, $(OPENBLT_PORT_DIR), *.c *.h *.s))
+#PROJ_FILES += $(filter-out $(OPENBLT_PORT_DIR)/flash_layout.c, $(call rwildcard, $(OPENBLT_PORT_DIR), *.c *.h *.s))
 # reuse ST32F7xx HAL and CMSIS from one of OpenBLT examples to avoid having copy in rusEFI git
-PROJ_FILES += $(filter-out uip, $(call rwildcard, $(OPENBLT_TRGT_DIR)/Demo/ARMCM7_STM32F7_Nucleo_F746ZG_GCC/Boot/lib/CMSIS/, *.c *.h *.s))
-PROJ_FILES += $(filter-out uip, $(call rwildcard, $(OPENBLT_TRGT_DIR)/Demo/ARMCM7_STM32F7_Nucleo_F746ZG_GCC/Boot/lib/STM32F7xx_HAL_Driver/, *.c *.h *.s))
+PROJ_FILES += $(filter-out uip, $(call rwildcard, $(OPENBLT_TRGT_DIR)/Source/ARMCM4_STM32F7/, *.c *.h *.s))
+PROJ_FILES += $(filter-out uip, $(call rwildcard, $(OPENBLT_TRGT_DIR)/Source/ARMCM4_STM32F7/GCC/, *.c *.h *.s))
 # stm32f767xx.h
-PROJ_FILES += $(wildcard $(OPENBLT_TRGT_DIR)/Demo/ARMCM7_STM32F7_Nucleo_F767ZI_GCC/Boot/lib/CMSIS/Device/ST/STM32F7xx/Include/*.h)
+#PROJ_FILES += $(wildcard $(OPENBLT_TRGT_DIR)/Demo/ARMCM7_STM32F7_Nucleo_F767ZI_GCC/Boot/lib/CMSIS/Device/ST/STM32F7xx/Include/*.h)
 #|--------------------------------------------------------------------------------------|
 #| Specific options for toolchain binaries                                              |
 #|--------------------------------------------------------------------------------------|
-PORTFLAGS   = -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER
+#PORTFLAGS   = -DUSE_FULL_LL_DRIVER -DUSE_HAL_DRIVER