diff --git a/firmware/config/boards/atlas/compile_atlas.sh b/firmware/config/boards/atlas/compile_atlas.sh
old mode 100644
new mode 100755
index d8261331ed..9f767b96a3
--- a/firmware/config/boards/atlas/compile_atlas.sh
+++ b/firmware/config/boards/atlas/compile_atlas.sh
@@ -1,5 +1,3 @@
 #!/bin/bash
-export PROJECT_BOARD=atlas
-export PROJECT_CPU=ARCH_STM32H7
 
-bash ../common_make.sh
+bash ../common_make.sh atlas ARCH_STM32H7
diff --git a/firmware/config/boards/clean_env_variables.sh b/firmware/config/boards/clean_env_variables.sh
index dca5484d22..7e82b3c526 100644
--- a/firmware/config/boards/clean_env_variables.sh
+++ b/firmware/config/boards/clean_env_variables.sh
@@ -3,8 +3,6 @@
 echo "clean_env_variables.sh: Cleaning up so that no one inherits any of these values"
 export DEBUG_LEVEL_OPT=""
 export EXTRA_PARAMS=""
-export PROJECT_BOARD=""
-export PROJECT_CPU=""
 export USE_BOOTLOADER=""
 export VAR_DEF_ENGINE_TYPE=""
 export LED_CRITICAL_ERROR_BRAIN_PIN=""
diff --git a/firmware/config/boards/common_make.sh b/firmware/config/boards/common_make.sh
index 6f797234f3..be367b0ca6 100644
--- a/firmware/config/boards/common_make.sh
+++ b/firmware/config/boards/common_make.sh
@@ -1,13 +1,16 @@
 #!/bin/bash
 
+PROJECT_BOARD=$1
+PROJECT_CPU=$2
+
 SCRIPT_NAME="common_make.sh"
-echo "Entering $SCRIPT_NAME"
+echo "Entering $SCRIPT_NAME with board $1 and CPU $2"
 
 cd ../../..
 
 mkdir .dep
 # todo: start using env variable for number of threads or for '-r'
-make -j$(nproc) -r
+make -j$(nproc) -r PROJECT_BOARD=$PROJECT_BOARD PROJECT_CPU=$PROJECT_CPU
 [ -e build/rusefi.hex ] || { echo "FAILED to compile by $SCRIPT_NAME with $PROJECT_BOARD $DEBUG_LEVEL_OPT and $EXTRA_PARAMS"; exit 1; }
 if [ $USE_OPENBLT = "yes" ]; then
   make openblt
diff --git a/firmware/config/boards/core8/compile_core8.sh b/firmware/config/boards/core8/compile_core8.sh
index 0d93cbb727..e4624b8e6c 100644
--- a/firmware/config/boards/core8/compile_core8.sh
+++ b/firmware/config/boards/core8/compile_core8.sh
@@ -1,5 +1,3 @@
 #!/bin/bash
-export PROJECT_BOARD=core8
-export PROJECT_CPU=ARCH_STM32F4
 
-bash ../common_make.sh
\ No newline at end of file
+bash ../common_make.sh core8 ARCH_STM32F4
\ No newline at end of file
diff --git a/firmware/config/boards/f429-discovery/compile_f429-discovery.sh b/firmware/config/boards/f429-discovery/compile_f429-discovery.sh
index 3f755bcebb..cb8053eb18 100755
--- a/firmware/config/boards/f429-discovery/compile_f429-discovery.sh
+++ b/firmware/config/boards/f429-discovery/compile_f429-discovery.sh
@@ -1,7 +1,5 @@
 #!/bin/bash
-export PROJECT_BOARD=f429-discovery
-export PROJECT_CPU=ARCH_STM32F4
 
 #-DDUMMY -DEFI_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_STACK_CHECK=FALSE -DCH_DBG_FILL_THREADS=FALSE -DCH_DBG_THREADS_PROFILING=FALSE"
 
-bash ../common_make.sh
+bash ../common_make.sh f429-discovery ARCH_STM32F4
diff --git a/firmware/config/boards/frankenso/compile_frankenso_na6.sh b/firmware/config/boards/frankenso/compile_frankenso_na6.sh
index b60c6c0db1..abff845a32 100644
--- a/firmware/config/boards/frankenso/compile_frankenso_na6.sh
+++ b/firmware/config/boards/frankenso/compile_frankenso_na6.sh
@@ -5,5 +5,4 @@ FW_ID_ENV=frankensoNA6
 
 export EXTRA_PARAMS="-DDUMMY -DSHORT_BOARD_NAME=frankenso_na6"
 
-bash ../common_make.sh
-
+bash ../common_make.sh f407-discovery ARCH_STM32F4
diff --git a/firmware/config/boards/hellen/alphax-2chan/compile_alphax-2chan.sh b/firmware/config/boards/hellen/alphax-2chan/compile_alphax-2chan.sh
index b6ef682ccf..0c8ddd88ac 100644
--- a/firmware/config/boards/hellen/alphax-2chan/compile_alphax-2chan.sh
+++ b/firmware/config/boards/hellen/alphax-2chan/compile_alphax-2chan.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
 
-export PROJECT_BOARD=hellen/alphax-2chan
-export PROJECT_CPU=ARCH_STM32F4
-
 cd ..
-bash ../common_make.sh
+bash ../common_make.sh hellen/alphax-2chan ARCH_STM32F4
diff --git a/firmware/config/boards/hellen/alphax-4chan/compile_alphax-4chan.sh b/firmware/config/boards/hellen/alphax-4chan/compile_alphax-4chan.sh
index 08c91e6e62..18d0e45f45 100644
--- a/firmware/config/boards/hellen/alphax-4chan/compile_alphax-4chan.sh
+++ b/firmware/config/boards/hellen/alphax-4chan/compile_alphax-4chan.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
 
-export PROJECT_BOARD=hellen/alphax-4chan
-export PROJECT_CPU=ARCH_STM32F4
-
 cd ..
-bash ../common_make.sh
+bash ../common_make.sh hellen/alphax-4chan ARCH_STM32F4
diff --git a/firmware/config/boards/hellen/compile_cypress.sh b/firmware/config/boards/hellen/compile_cypress.sh
index 805eeffce5..ed09fd22d9 100644
--- a/firmware/config/boards/hellen/compile_cypress.sh
+++ b/firmware/config/boards/hellen/compile_cypress.sh
@@ -15,10 +15,8 @@ export EXTRA_PARAMS="-DDUMMY -D__USE_CMSIS\
 TRIGGER_USE_ADC = yes
 
 export BUILDDIR="build"
-export PROJECT_BOARD="hellen/cypress"
-export PROJECT_CPU="cypress"
 export USE_FATFS="no"
 export USE_BOOTLOADER="no"
 export DEBUG_LEVEL_OPT="-O2"
 
-bash ../common_make.sh
+bash ../common_make.sh hellen/cypress cypress
diff --git a/firmware/config/boards/hellen/harley81/compile_harley81.sh b/firmware/config/boards/hellen/harley81/compile_harley81.sh
index 0adc2b071d..cec988b120 100644
--- a/firmware/config/boards/hellen/harley81/compile_harley81.sh
+++ b/firmware/config/boards/hellen/harley81/compile_harley81.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
 
-export PROJECT_BOARD=hellen/harley81
-export PROJECT_CPU=ARCH_STM32F4
-
 cd ..
-bash ../common_make.sh
+bash ../common_make.sh hellen/harley81 ARCH_STM32F4
diff --git a/firmware/config/boards/hellen/hellen-nb1/compile_hellen-nb1.sh b/firmware/config/boards/hellen/hellen-nb1/compile_hellen-nb1.sh
index b16dd6d318..6af1da137a 100644
--- a/firmware/config/boards/hellen/hellen-nb1/compile_hellen-nb1.sh
+++ b/firmware/config/boards/hellen/hellen-nb1/compile_hellen-nb1.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
 
-export PROJECT_BOARD=hellen/hellen-nb1
-export PROJECT_CPU=ARCH_STM32F4
-
 cd ..
-bash ../common_make.sh
+bash ../common_make.sh hellen/hellen-nb1 ARCH_STM32F4
diff --git a/firmware/config/boards/hellen/hellen121nissan/compile_hellen121nissan.sh b/firmware/config/boards/hellen/hellen121nissan/compile_hellen121nissan.sh
index 6fe93fa64d..3d681dca5d 100644
--- a/firmware/config/boards/hellen/hellen121nissan/compile_hellen121nissan.sh
+++ b/firmware/config/boards/hellen/hellen121nissan/compile_hellen121nissan.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
 
-export PROJECT_BOARD=hellen/hellen121nissan
-export PROJECT_CPU=ARCH_STM32F4
-
 cd ..
-bash ../common_make.sh
+bash ../common_make.sh hellen/hellen121nissan ARCH_STM32F4
diff --git a/firmware/config/boards/hellen/hellen121vag/compile_hellen121vag.sh b/firmware/config/boards/hellen/hellen121vag/compile_hellen121vag.sh
index fb78bea0f0..05cef9f765 100644
--- a/firmware/config/boards/hellen/hellen121vag/compile_hellen121vag.sh
+++ b/firmware/config/boards/hellen/hellen121vag/compile_hellen121vag.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
 
-export PROJECT_BOARD=hellen/hellen121vag
-export PROJECT_CPU=ARCH_STM32F4
-
 cd ..
-bash ../common_make.sh
+bash ../common_make.sh hellen/hellen121vag ARCH_STM32F4
diff --git a/firmware/config/boards/hellen/hellen128/compile_hellen128.sh b/firmware/config/boards/hellen/hellen128/compile_hellen128.sh
index 426a31106c..9c1e87bfb2 100644
--- a/firmware/config/boards/hellen/hellen128/compile_hellen128.sh
+++ b/firmware/config/boards/hellen/hellen128/compile_hellen128.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
 
-export PROJECT_BOARD=hellen/hellen128
-export PROJECT_CPU=ARCH_STM32F4
-
 cd ..
-bash ../common_make.sh
+bash ../common_make.sh hellen/hellen128 ARCH_STM32F4
diff --git a/firmware/config/boards/hellen/hellen154hyundai/compile_hellen154hyundai.sh b/firmware/config/boards/hellen/hellen154hyundai/compile_hellen154hyundai.sh
index cf28921673..3e4e387790 100644
--- a/firmware/config/boards/hellen/hellen154hyundai/compile_hellen154hyundai.sh
+++ b/firmware/config/boards/hellen/hellen154hyundai/compile_hellen154hyundai.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
 
-export PROJECT_BOARD=hellen/hellen154hyundai
-export PROJECT_CPU=ARCH_STM32F4
-
 cd ..
-bash ../common_make.sh
+bash ../common_make.sh hellen/hellen154hyundai ARCH_STM32F4
diff --git a/firmware/config/boards/hellen/hellen64_miataNA6_94/compile_hellenNA6.sh b/firmware/config/boards/hellen/hellen64_miataNA6_94/compile_hellenNA6.sh
index 2ac48fff5a..a9afb0d28c 100644
--- a/firmware/config/boards/hellen/hellen64_miataNA6_94/compile_hellenNA6.sh
+++ b/firmware/config/boards/hellen/hellen64_miataNA6_94/compile_hellenNA6.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
 
-export PROJECT_BOARD=hellen/hellen64_miataNA6_94
-export PROJECT_CPU=ARCH_STM32F4
-
 cd ..
-bash ../common_make.sh
+bash ../common_make.sh hellen/hellen64_miataNA6_94 ARCH_STM32F4
diff --git a/firmware/config/boards/hellen/hellen72/compile_hellen72.sh b/firmware/config/boards/hellen/hellen72/compile_hellen72.sh
index 0ec5079e0d..c83e5b0f38 100644
--- a/firmware/config/boards/hellen/hellen72/compile_hellen72.sh
+++ b/firmware/config/boards/hellen/hellen72/compile_hellen72.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
 
-export PROJECT_BOARD=hellen/hellen72
-export PROJECT_CPU=ARCH_STM32F4
-
 cd ..
-bash ../common_make.sh
+bash ../common_make.sh hellen/hellen72 ARCH_STM32F4
diff --git a/firmware/config/boards/hellen/hellen81/compile_hellen81.sh b/firmware/config/boards/hellen/hellen81/compile_hellen81.sh
index 8a0b4995f8..ad452a1ddc 100755
--- a/firmware/config/boards/hellen/hellen81/compile_hellen81.sh
+++ b/firmware/config/boards/hellen/hellen81/compile_hellen81.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
 
-export PROJECT_BOARD=hellen/hellen81
-export PROJECT_CPU=ARCH_STM32H7
-
 cd ..
-bash ../common_make.sh
+bash ../common_make.sh hellen/hellen81 ARCH_STM32H7
diff --git a/firmware/config/boards/hellen/hellen88bmw/compile_hellen88bmw.sh b/firmware/config/boards/hellen/hellen88bmw/compile_hellen88bmw.sh
index 8e1e97949d..57179cd70c 100755
--- a/firmware/config/boards/hellen/hellen88bmw/compile_hellen88bmw.sh
+++ b/firmware/config/boards/hellen/hellen88bmw/compile_hellen88bmw.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
 
-export PROJECT_BOARD=hellen/hellen88bmw
-export PROJECT_CPU=ARCH_STM32F4
-
 cd ..
-bash ../common_make.sh
+bash ../common_make.sh hellen/hellen88bmw ARCH_STM32F4
diff --git a/firmware/config/boards/hellen/hellenNA8_96/compile_hellenNA8_96.sh b/firmware/config/boards/hellen/hellenNA8_96/compile_hellenNA8_96.sh
index b16dd6d318..6af1da137a 100644
--- a/firmware/config/boards/hellen/hellenNA8_96/compile_hellenNA8_96.sh
+++ b/firmware/config/boards/hellen/hellenNA8_96/compile_hellenNA8_96.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
 
-export PROJECT_BOARD=hellen/hellen-nb1
-export PROJECT_CPU=ARCH_STM32F4
-
 cd ..
-bash ../common_make.sh
+bash ../common_make.sh hellen/hellen-nb1 ARCH_STM32F4
diff --git a/firmware/config/boards/microrusefi/compile_mre_f4.sh b/firmware/config/boards/microrusefi/compile_mre_f4.sh
index 001536efee..6f00bea0b5 100755
--- a/firmware/config/boards/microrusefi/compile_mre_f4.sh
+++ b/firmware/config/boards/microrusefi/compile_mre_f4.sh
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-export PROJECT_BOARD=microrusefi
-export PROJECT_CPU=ARCH_STM32F4
-
 # export USE_OPENBLT=yes
 
-bash ../common_make.sh
+bash ../common_make.sh microrusefi ARCH_STM32F4
diff --git a/firmware/config/boards/microrusefi/compile_mre_f4_debug.sh b/firmware/config/boards/microrusefi/compile_mre_f4_debug.sh
index 0f74dcc879..cef2818689 100755
--- a/firmware/config/boards/microrusefi/compile_mre_f4_debug.sh
+++ b/firmware/config/boards/microrusefi/compile_mre_f4_debug.sh
@@ -1,11 +1,8 @@
 #!/bin/bash
 
-export PROJECT_BOARD=microrusefi
-export PROJECT_CPU=ARCH_STM32F4
-
 export EXTRA_PARAMS="-DRAMDISK_INVALID"
 export DEBUG_LEVEL_OPT="-O0 -ggdb -g"
 
 # export USE_OPENBLT=yes
 
-bash ../common_make.sh
+bash ../common_make.sh microrusefi ARCH_STM32F4
diff --git a/firmware/config/boards/microrusefi/compile_mre_f4_hardware_QC_special_build.sh b/firmware/config/boards/microrusefi/compile_mre_f4_hardware_QC_special_build.sh
index d2d0b4156d..40d4a7f0d5 100755
--- a/firmware/config/boards/microrusefi/compile_mre_f4_hardware_QC_special_build.sh
+++ b/firmware/config/boards/microrusefi/compile_mre_f4_hardware_QC_special_build.sh
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-export PROJECT_BOARD=microrusefi
-export PROJECT_CPU=ARCH_STM32F4
 export EXTRA_PARAMS="-DDUMMY \
  -DHW_CHECK_MODE=TRUE \
  -DANALOG_HW_CHECK_MODE=TRUE \
@@ -24,6 +22,4 @@ export VAR_DEF_ENGINE_TYPE=-DDEFAULT_ENGINE_TYPE=MRE_BOARD_NEW_TEST
 # this QC configuration is used to assert our status with debug info
 export DEBUG_LEVEL_OPT="-O0 -ggdb -g"
 
-bash ../common_make.sh
-
-
+bash ../common_make.sh microrusefi ARCH_STM32F4
diff --git a/firmware/config/boards/microrusefi/compile_mre_f4_recovery.sh b/firmware/config/boards/microrusefi/compile_mre_f4_recovery.sh
index d8c244ead9..9812fdeecf 100644
--- a/firmware/config/boards/microrusefi/compile_mre_f4_recovery.sh
+++ b/firmware/config/boards/microrusefi/compile_mre_f4_recovery.sh
@@ -1,9 +1,7 @@
 #!/bin/bash
 
-export PROJECT_BOARD=microrusefi
-export PROJECT_CPU=ARCH_STM32F4
 export EXTRA_PARAMS="-DIGNORE_FLASH_CONFIGURATION=TRUE"
 
 # export DEBUG_LEVEL_OPT="-O0 -ggdb -g"
 
-bash ../common_make.sh
+bash ../common_make.sh microrusefi ARCH_STM32F4
diff --git a/firmware/config/boards/microrusefi/compile_mre_f4_slave.sh b/firmware/config/boards/microrusefi/compile_mre_f4_slave.sh
index c062ed9701..d11e926b5f 100755
--- a/firmware/config/boards/microrusefi/compile_mre_f4_slave.sh
+++ b/firmware/config/boards/microrusefi/compile_mre_f4_slave.sh
@@ -1,11 +1,9 @@
 #!/bin/bash
 
-export PROJECT_BOARD=microrusefi
-export PROJECT_CPU=ARCH_STM32F4
 export EXTRA_PARAMS=-DDUMMY -DEFI_CANBUS_SLAVE=TRUE
 
 export VAR_DEF_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=BMW_M73_MRE_SLAVE
 
-bash ../common_make.sh
+bash ../common_make.sh microrusefi ARCH_STM32F4
 
 
diff --git a/firmware/config/boards/microrusefi/compile_mre_f7.sh b/firmware/config/boards/microrusefi/compile_mre_f7.sh
index 99a5564ac2..81cde41566 100755
--- a/firmware/config/boards/microrusefi/compile_mre_f7.sh
+++ b/firmware/config/boards/microrusefi/compile_mre_f7.sh
@@ -1,6 +1,3 @@
 #!/bin/bash
 
-export PROJECT_BOARD=microrusefi
-export PROJECT_CPU=ARCH_STM32F7
-
-bash ../common_make.sh
+bash ../common_make.sh microrusefi ARCH_STM32F7
diff --git a/firmware/config/boards/microrusefi/compile_mre_f7_test.sh b/firmware/config/boards/microrusefi/compile_mre_f7_test.sh
index c23a0a52ab..2e72c4e987 100755
--- a/firmware/config/boards/microrusefi/compile_mre_f7_test.sh
+++ b/firmware/config/boards/microrusefi/compile_mre_f7_test.sh
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-export PROJECT_BOARD=microrusefi
-export PROJECT_CPU=ARCH_STM32F7
 export VAR_DEF_ENGINE_TYPE="-DDEFAULT_ENGINE_TYPE=MRE_BOARD_TEST"
 
-bash ../common_make.sh
+bash ../common_make.sh microrusefi ARCH_STM32F7
diff --git a/firmware/config/boards/nucleo_f767/compile_stm32f767_nucleo.sh b/firmware/config/boards/nucleo_f767/compile_stm32f767_nucleo.sh
index 160198de29..e65456ba31 100644
--- a/firmware/config/boards/nucleo_f767/compile_stm32f767_nucleo.sh
+++ b/firmware/config/boards/nucleo_f767/compile_stm32f767_nucleo.sh
@@ -5,8 +5,6 @@
 SCRIPT_NAME="compile_nucleo_f767.sh"
 echo "Entering $SCRIPT_NAME"
 
-export PROJECT_BOARD=nucleo_f767
-export PROJECT_CPU=ARCH_STM32F7
 export EXTRA_PARAMS="-DDUMMY -DSTM32F767xx \
  -DEFI_INJECTOR_PIN3=GPIO_UNASSIGNED \
  -DFIRMWARE_ID=\\\"nucleo767\\\" \
@@ -16,4 +14,4 @@ export EXTRA_PARAMS="-DDUMMY -DSTM32F767xx \
  -DCH_DBG_ENABLE_CHECKS=FALSE -DCH_DBG_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_STACK_CHECK=FALSE -DCH_DBG_FILL_THREADS=FALSE -DCH_DBG_THREADS_PROFILING=FALSE"
 export DEBUG_LEVEL_OPT="-O2"
 
-bash ../common_make.sh
+bash ../common_make.sh nucleo_f767 ARCH_STM32F7
diff --git a/firmware/config/boards/nucleo_f767/compile_stm32f767_osc.sh b/firmware/config/boards/nucleo_f767/compile_stm32f767_osc.sh
index 1bc13aa824..782178e23c 100644
--- a/firmware/config/boards/nucleo_f767/compile_stm32f767_osc.sh
+++ b/firmware/config/boards/nucleo_f767/compile_stm32f767_osc.sh
@@ -2,8 +2,6 @@
 
 # STM32F767 version of the firmware for F767ZI chip NOT on Nucleo board, with a real oscilattor
 
-export PROJECT_BOARD=nucleo_f767
-export PROJECT_CPU=ARCH_STM32F7
 export EXTRA_PARAMS="-DDUMMY -DSTM32F767xx \
  -DEFI_INJECTOR_PIN3=GPIO_UNASSIGNED \
  -DFIRMWARE_ID=\\\"board767\\\" \
@@ -16,5 +14,5 @@ export EXTRA_PARAMS="-DDUMMY -DSTM32F767xx \
 # Do not forget to comment out following line if looking to debug!
 export DEBUG_LEVEL_OPT="-O2"
 
-bash ../common_make.sh
+bash ../common_make.sh nucleo_f767 ARCH_STM32F7
 
diff --git a/firmware/config/boards/nucleo_h743/compile_stm32h743_nucleo.sh b/firmware/config/boards/nucleo_h743/compile_stm32h743_nucleo.sh
index fd6f2ef244..c1f2fe0042 100644
--- a/firmware/config/boards/nucleo_h743/compile_stm32h743_nucleo.sh
+++ b/firmware/config/boards/nucleo_h743/compile_stm32h743_nucleo.sh
@@ -5,8 +5,6 @@
 SCRIPT_NAME="compile_nucleo_h743.sh"
 echo "Entering $SCRIPT_NAME"
 
-export PROJECT_BOARD=nucleo_h743
-export PROJECT_CPU=ARCH_STM32H7
 export EXTRA_PARAMS="-DDUMMY \
  -DEFI_INJECTOR_PIN3=GPIO_UNASSIGNED \
  -DFIRMWARE_ID=\\\"nucleoH743\\\" \
@@ -14,4 +12,4 @@ export EXTRA_PARAMS="-DDUMMY \
  -DLED_CRITICAL_ERROR_BRAIN_PIN=GPIOB_14"
 export DEBUG_LEVEL_OPT="-O2"
 
-bash ../common_make.sh
+bash ../common_make.sh nucleo_h743 ARCH_STM32H7
diff --git a/firmware/config/boards/prometheus/compile_prometheus_405.sh b/firmware/config/boards/prometheus/compile_prometheus_405.sh
index 18498a5a1c..a4b8cb872f 100644
--- a/firmware/config/boards/prometheus/compile_prometheus_405.sh
+++ b/firmware/config/boards/prometheus/compile_prometheus_405.sh
@@ -2,7 +2,5 @@
 
 # STM32F405 version of the firmware for https://rusefi.com/forum/viewtopic.php?f=4&t=1215
 
-export PROJECT_BOARD=prometheus/f405
-
-bash ../common_make.sh
+bash ../common_make.sh prometheus/f405 ARCH_STM32F4
 
diff --git a/firmware/config/boards/prometheus/compile_prometheus_469.sh b/firmware/config/boards/prometheus/compile_prometheus_469.sh
index 2b67b80e6e..6ff7f207af 100644
--- a/firmware/config/boards/prometheus/compile_prometheus_469.sh
+++ b/firmware/config/boards/prometheus/compile_prometheus_469.sh
@@ -2,8 +2,7 @@
 
 # STM32F469 version of the firmware for https://rusefi.com/forum/viewtopic.php?f=4&t=1215
 
-export PROJECT_BOARD=prometheus/f469
 export USE_BOOTLOADER=yes
 
-bash ../common_make.sh
+bash ../common_make.sh prometheus/f469 ARCH_STM32F4
 
diff --git a/firmware/config/boards/proteus/compile_proteus_f4.sh b/firmware/config/boards/proteus/compile_proteus_f4.sh
index 3c5327ebb8..1bb87675e1 100755
--- a/firmware/config/boards/proteus/compile_proteus_f4.sh
+++ b/firmware/config/boards/proteus/compile_proteus_f4.sh
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-export PROJECT_BOARD=proteus
-export PROJECT_CPU=ARCH_STM32F4
-
 # export USE_OPENBLT=yes
 
-bash ../common_make.sh
+bash ../common_make.sh proteus ARCH_STM32F4
diff --git a/firmware/config/boards/proteus/compile_proteus_f4_hardware_QC_special_build.sh b/firmware/config/boards/proteus/compile_proteus_f4_hardware_QC_special_build.sh
index 04d27e7096..419a36b490 100755
--- a/firmware/config/boards/proteus/compile_proteus_f4_hardware_QC_special_build.sh
+++ b/firmware/config/boards/proteus/compile_proteus_f4_hardware_QC_special_build.sh
@@ -1,11 +1,9 @@
 #!/bin/bash
 
-export PROJECT_BOARD=proteus
-export PROJECT_CPU=ARCH_STM32F4
 export EXTRA_PARAMS="-DVR_HW_CHECK_MODE=TRUE -DHW_CHECK_MODE=TRUE -DHW_CHECK_SD=TRUE -DHW_CHECK_ALWAYS_STIMULATE=TRUE"
 
 export VAR_DEF_ENGINE_TYPE=-DDEFAULT_ENGINE_TYPE=PROTEUS_QC_TEST_BOARD
 
 # export DEBUG_LEVEL_OPT="-O0 -ggdb -g"
 
-bash ../common_make.sh
+bash ../common_make.sh proteus ARCH_STM32F4
diff --git a/firmware/config/boards/proteus/compile_proteus_f7.sh b/firmware/config/boards/proteus/compile_proteus_f7.sh
index db9ac54bf1..dcb2bfdab1 100755
--- a/firmware/config/boards/proteus/compile_proteus_f7.sh
+++ b/firmware/config/boards/proteus/compile_proteus_f7.sh
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-export PROJECT_BOARD=proteus
-export PROJECT_CPU=ARCH_STM32F7
-
 # export USE_OPENBLT=yes
 
-bash ../common_make.sh
+bash ../common_make.sh proteus ARCH_STM32F7
diff --git a/firmware/config/boards/proteus/compile_proteus_f7_hardware_QC_special_build.sh b/firmware/config/boards/proteus/compile_proteus_f7_hardware_QC_special_build.sh
index e161ed49cb..ada3743ee2 100755
--- a/firmware/config/boards/proteus/compile_proteus_f7_hardware_QC_special_build.sh
+++ b/firmware/config/boards/proteus/compile_proteus_f7_hardware_QC_special_build.sh
@@ -1,11 +1,9 @@
 #!/bin/bash
 
-export PROJECT_BOARD=proteus
-export PROJECT_CPU=ARCH_STM32F7
 export EXTRA_PARAMS="-DVR_HW_CHECK_MODE=TRUE -DHW_CHECK_MODE=TRUE -DHW_CHECK_SD=TRUE -DHW_CHECK_ALWAYS_STIMULATE=TRUE"
 
 export VAR_DEF_ENGINE_TYPE=-DDEFAULT_ENGINE_TYPE=PROTEUS_QC_TEST_BOARD
 
 # export DEBUG_LEVEL_OPT="-O0 -ggdb -g"
 
-bash ../common_make.sh
+bash ../common_make.sh proteus ARCH_STM32F7
diff --git a/firmware/config/boards/proteus/compile_proteus_h7.sh b/firmware/config/boards/proteus/compile_proteus_h7.sh
index e8aea1417b..d8f983d5cf 100755
--- a/firmware/config/boards/proteus/compile_proteus_h7.sh
+++ b/firmware/config/boards/proteus/compile_proteus_h7.sh
@@ -1,6 +1,3 @@
 #!/bin/bash
 
-export PROJECT_BOARD=proteus
-export PROJECT_CPU=ARCH_STM32H7
-
-bash ../common_make.sh
+bash ../common_make.sh proteus ARCH_STM32H7
diff --git a/firmware/config/boards/proteus/compile_proteus_legacy.sh b/firmware/config/boards/proteus/compile_proteus_legacy.sh
index b1f4d71eac..af72e6513c 100755
--- a/firmware/config/boards/proteus/compile_proteus_legacy.sh
+++ b/firmware/config/boards/proteus/compile_proteus_legacy.sh
@@ -2,8 +2,6 @@
 
 # Use this script for Proteus v0.1/0.2 (boards where vbat was on ADC3)
 
-export PROJECT_BOARD=proteus
-export PROJECT_CPU=ARCH_STM32F7
 export PROTEUS_LEGACY=TRUE
 
-bash ../common_make.sh
+bash ../common_make.sh proteus ARCH_STM32F7
diff --git a/firmware/config/boards/subaru_eg33/compile_subaru_eg33_f7.sh b/firmware/config/boards/subaru_eg33/compile_subaru_eg33_f7.sh
index 99e3e3c2ff..0da6d174c6 100644
--- a/firmware/config/boards/subaru_eg33/compile_subaru_eg33_f7.sh
+++ b/firmware/config/boards/subaru_eg33/compile_subaru_eg33_f7.sh
@@ -1,9 +1,7 @@
 #!/bin/bash
-export PROJECT_BOARD=subaru_eg33
-export PROJECT_CPU=ARCH_STM32F7
 
 #-DDUMMY -DEFI_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_STACK_CHECK=FALSE -DCH_DBG_FILL_THREADS=FALSE -DCH_DBG_THREADS_PROFILING=FALSE"
 
 export USE_OPENBLT=yes
 
-bash ../common_make.sh
+bash ../common_make.sh subaru_eg33 ARCH_STM32F7
diff --git a/firmware/config/boards/subaru_eg33/make.sh b/firmware/config/boards/subaru_eg33/make.sh
index e73244e45a..625e8bcd65 100755
--- a/firmware/config/boards/subaru_eg33/make.sh
+++ b/firmware/config/boards/subaru_eg33/make.sh
@@ -1,6 +1,4 @@
 #!/bin/bash
-export PROJECT_BOARD=subaru_eg33
-export PROJECT_CPU=ARCH_STM32F7
 export EXTRA_PARAMS="-DDUMMY -DEFI_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_STACK_CHECK=FALSE -DCH_DBG_FILL_THREADS=FALSE -DCH_DBG_THREADS_PROFILING=FALSE"
 export VAR_DEF_ENGINE_TYPE="-DDEFAULT_ENGINE_TYPE=SUBARUEG33_DEFAULTS"
 #echo $EXTRA_PARAMS
@@ -8,4 +6,4 @@ export VAR_DEF_ENGINE_TYPE="-DDEFAULT_ENGINE_TYPE=SUBARUEG33_DEFAULTS"
 
 export USE_OPENBLT=yes
 
-bash ../common_make.sh
+bash ../common_make.sh subaru_eg33 ARCH_STM32F7
diff --git a/firmware/config/boards/tdg-pdm8/compile_tdg-pdm8.sh b/firmware/config/boards/tdg-pdm8/compile_tdg-pdm8.sh
index a6fb7bf5a3..992ef3221d 100755
--- a/firmware/config/boards/tdg-pdm8/compile_tdg-pdm8.sh
+++ b/firmware/config/boards/tdg-pdm8/compile_tdg-pdm8.sh
@@ -1,4 +1,3 @@
 #!/bin/bash
-export PROJECT_BOARD=tdg-pdm8
 
-bash ../common_make.sh
+bash ../common_make.sh tdg-pdm8 ARCH_STM32F4