diff --git a/firmware/bootloader/!compile_bootloader_405.bat b/firmware/bootloader/!compile_bootloader_405.bat
index 2bd95ae734..84d1b9c3db 100644
--- a/firmware/bootloader/!compile_bootloader_405.bat
+++ b/firmware/bootloader/!compile_bootloader_405.bat
@@ -5,7 +5,7 @@ echo Starting compilation for Prometheus-405
 set PROJECT_BOARD=Prometheus
 set PROMETHEUS_BOARD=405
 set EXTRA_PARAMS=-DDUMMY -DSTM32F405xx -DEFI_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_CHECKS=FALSE -DCH_DBG_ENABLE_TRACE=FALSE -DCH_DBG_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_STACK_CHECK=FALSE -DCH_DBG_FILL_THREADS=FALSE -DCH_DBG_THREADS_PROFILING=FALSE
-set BOOTLOADER_CODE_DESTINATION_PATH="../Prometheus/469"
+set BOOTLOADER_CODE_DESTINATION_PATH="../Prometheus/405"
 set DEBUG_LEVEL_OPT="-O2"
 
 call !compile_bootloader.bat -r
diff --git a/firmware/bootloader/src/Makefile b/firmware/bootloader/src/Makefile
index 61e60c3071..83366ceed8 100644
--- a/firmware/bootloader/src/Makefile
+++ b/firmware/bootloader/src/Makefile
@@ -171,7 +171,6 @@ CPPSRC = $(CHCPPSRC) \
 	$(ENGINES_SRC_CPP) \
 	$(HW_LAYER_EMS_CPP) \
 	$(HW_SENSORS_SRC) \
-	$(HW_STM32_SRC_CPP) \
 	$(TUNERSTUDIO_SRC_CPP) \
 	$(CONSOLE_SRC_CPP) \
 	$(CONTROLLERS_SENSORS_SRC_CPP) \
diff --git a/firmware/hw_layer/hw_layer.mk b/firmware/hw_layer/hw_layer.mk
index 0190ef860c..4b4ec0077e 100644
--- a/firmware/hw_layer/hw_layer.mk
+++ b/firmware/hw_layer/hw_layer.mk
@@ -36,19 +36,16 @@ HW_LAYER_EMS_CPP = $(HW_LAYER_EGT_CPP) \
 ifeq ($(PROJECT_CPU),ST_STM32F7)
 HW_LAYER_EMS += $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f7/stm32f7xx_hal_flash.c \
 				$(PROJECT_DIR)/hw_layer/ports/stm32/stm32f7/stm32f7xx_hal_flash_ex.c
-HW_LAYER_EMS_CPP += $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f7/mpu_util.cpp \
-	$(PROJECT_DIR)/hw_layer/ports/stm32/stm32_common.cpp
+include $(PROJECT_DIR)/hw_layer/$(CPU_HWLAYER)/hw_stm32.mk
 endif
 
 ifeq ($(PROJECT_CPU),ST_STM32F4)
 HW_LAYER_EMS += $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f4/stm32f4xx_hal_flash.c \
 				$(PROJECT_DIR)/hw_layer/ports/stm32/stm32f4/stm32f4xx_hal_flash_ex.c
-HW_LAYER_EMS_CPP += $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f4/mpu_util.cpp \
-	$(PROJECT_DIR)/hw_layer/ports/stm32/stm32_common.cpp
+include $(PROJECT_DIR)/hw_layer/$(CPU_HWLAYER)/hw_stm32.mk
 endif
 	
 ifeq ($(PROJECT_CPU),ST_STM32F1)
-HW_LAYER_EMS_CPP += $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f1/mpu_util.cpp \
-	$(PROJECT_DIR)/hw_layer/ports/stm32/stm32_common.cpp
+include $(PROJECT_DIR)/hw_layer/$(CPU_HWLAYER)/hw_stm32.mk
 endif
 	
\ No newline at end of file
diff --git a/firmware/hw_layer/ports/stm32/stm32f1/hw_stm32.mk b/firmware/hw_layer/ports/stm32/stm32f1/hw_stm32.mk
new file mode 100644
index 0000000000..8af34c257e
--- /dev/null
+++ b/firmware/hw_layer/ports/stm32/stm32f1/hw_stm32.mk
@@ -0,0 +1,3 @@
+
+HW_LAYER_EMS_CPP += $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f1/mpu_util.cpp \
+	$(PROJECT_DIR)/hw_layer/ports/stm32/stm32_common.cpp
diff --git a/firmware/hw_layer/ports/stm32/stm32f4/hw_stm32.mk b/firmware/hw_layer/ports/stm32/stm32f4/hw_stm32.mk
index 0f1cb436d2..ec2bc46d7e 100644
--- a/firmware/hw_layer/ports/stm32/stm32f4/hw_stm32.mk
+++ b/firmware/hw_layer/ports/stm32/stm32f4/hw_stm32.mk
@@ -1,4 +1,4 @@
 
-
-HW_STM32_SRC_CPP = $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f4/mpu_util.cpp
+HW_LAYER_EMS_CPP += $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f4/mpu_util.cpp \
+	$(PROJECT_DIR)/hw_layer/ports/stm32/stm32_common.cpp
 	
\ No newline at end of file
diff --git a/firmware/hw_layer/ports/stm32/stm32f7/hw_stm32.mk b/firmware/hw_layer/ports/stm32/stm32f7/hw_stm32.mk
index 42067807d7..c3d982ebbf 100644
--- a/firmware/hw_layer/ports/stm32/stm32f7/hw_stm32.mk
+++ b/firmware/hw_layer/ports/stm32/stm32f7/hw_stm32.mk
@@ -1,4 +1,4 @@
 
-
-HW_STM32_SRC_CPP = $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f7/mpu_util.cpp
+HW_LAYER_EMS_CPP += $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f7/mpu_util.cpp \
+	$(PROJECT_DIR)/hw_layer/ports/stm32/stm32_common.cpp
 	
\ No newline at end of file