diff --git a/firmware/config/boards/common_make.bat b/firmware/config/boards/common_make.bat
index 9cee8c4053..f1c837c6b2 100644
--- a/firmware/config/boards/common_make.bat
+++ b/firmware/config/boards/common_make.bat
@@ -1,9 +1,11 @@
 set script_name=common_make.bat
 echo Entering %script_name%
 
+mkdir .dep
 rem todo: start using env variable for number of threads or for '-r'
 make -j4 -r
 if not exist build/rusefi.hex echo FAILED to compile by %script_name%
 if not exist build/rusefi.hex exit -1
 
-../misc/encedo_hex2dfu/hex2dfu.exe -i build/rusefi.hex -o build/rusefi.dfu
\ No newline at end of file
+echo %script_name%: invoking hex2dfu.exe
+..\misc\encedo_hex2dfu\hex2dfu.exe -i build/rusefi.hex -o build/rusefi.dfu
\ No newline at end of file
diff --git a/firmware/config/boards/nucleo_f767/!compile-stm32f767_osc.bat b/firmware/config/boards/nucleo_f767/!compile-stm32f767_osc.bat
index 397ee7afca..c106c9aa75 100644
--- a/firmware/config/boards/nucleo_f767/!compile-stm32f767_osc.bat
+++ b/firmware/config/boards/nucleo_f767/!compile-stm32f767_osc.bat
@@ -16,10 +16,6 @@ set EXTRA_PARAMS=-DDUMMY -DSTM32F767xx ^
 rem Do not forget to comment out following line if looking to debug!
 set DEBUG_LEVEL_OPT="-O2"
 
-make -j4
-if not exist build/rusefi.hex echo FAILED to compile osc_f767
-if not exist build/rusefi.hex exit -1
-
-..\misc\hex2dfu\HEX2DFU.exe build/rusefi.hex -out build/rusefi.dfu
+call config/boards/common_make.bat
 
 call config/boards/clean_env_variables.bat
diff --git a/firmware/config/boards/prometheus/!compile-prometheus_405.bat b/firmware/config/boards/prometheus/!compile-prometheus_405.bat
index d824711a4d..90c4a1eb00 100644
--- a/firmware/config/boards/prometheus/!compile-prometheus_405.bat
+++ b/firmware/config/boards/prometheus/!compile-prometheus_405.bat
@@ -8,10 +8,7 @@ set PROMETHEUS_BOARD=405
 set EXTRA_PARAMS="-DDUMMY -DSTM32F405xx -DEFI_ENABLE_ASSERTS=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 DEBUG_LEVEL_OPT="-O2"
 set USE_BOOTLOADER=yes
-rem call compile.bat -r
-rem temp stuff trying to fix CI
-make clean
-mkdir .dep
-make -r
+
+call config/boards/common_make.bat
 
 call config/boards/clean_env_variables.bat
\ No newline at end of file
diff --git a/firmware/config/boards/prometheus/!compile-prometheus_469.bat b/firmware/config/boards/prometheus/!compile-prometheus_469.bat
index 92964f1b8c..978a9221b4 100644
--- a/firmware/config/boards/prometheus/!compile-prometheus_469.bat
+++ b/firmware/config/boards/prometheus/!compile-prometheus_469.bat
@@ -8,10 +8,7 @@ set PROMETHEUS_BOARD=469
 set EXTRA_PARAMS="-DDUMMY -DSTM32F469xx -DEFI_ENABLE_ASSERTS=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 DEBUG_LEVEL_OPT="-O2"
 set USE_BOOTLOADER=yes
-rem call compile.bat -r
-rem temp stuff trying to fix CI
-make clean
-mkdir .dep
-make -r
+
+call config/boards/common_make.bat
 
 call config/boards/clean_env_variables.bat