diff --git a/firmware/config/boards/clean_env_variables.bat b/firmware/config/boards/clean_env_variables.bat
index 2c74fc25c5..ff18965ae7 100644
--- a/firmware/config/boards/clean_env_variables.bat
+++ b/firmware/config/boards/clean_env_variables.bat
@@ -5,3 +5,5 @@ set EXTRA_PARAMS=
 set PROJECT_BOARD=
 set PROJECT_CPU=
 set USE_BOOTLOADER=
+set DEFAULT_ENGINE_TYPE=
+set EFI_FATAL_ERROR_PIN=
diff --git a/firmware/config/boards/microrusefi/!compile-nucleo-Manhattan.bat b/firmware/config/boards/microrusefi/!compile-nucleo-Manhattan.bat
index dd4dad9e6d..b8e0a6b99e 100644
--- a/firmware/config/boards/microrusefi/!compile-nucleo-Manhattan.bat
+++ b/firmware/config/boards/microrusefi/!compile-nucleo-Manhattan.bat
@@ -5,10 +5,12 @@ set LDSCRIPT = config/boards/NUCLEO_F767/STM32F76xxI.ld
 
 set PROJECT_BOARD=microrusefi
 set PROJECT_CPU=ARCH_STM32F7
+
+set DEFAULT_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=BMW_M73_F
+set EFI_FATAL_ERROR_PIN = -DEFI_FATAL_ERROR_PIN=GPIOB_14
+
 set EXTRA_PARAMS=-DDUMMY ^
- -DEFI_COMMUNICATION_PIN=GPIOB_7 ^
- -DEFI_FATAL_ERROR_PIN=GPIOB_14 ^
- -DDEFAULT_ENGINE_TYPE=BMW_M73_F
+ -DEFI_COMMUNICATION_PIN=GPIOB_7
 
 rem -DDEFAULT_ENGINE_TYPE=MRE_BOARD_TEST
 
diff --git a/firmware/config/boards/microrusefi/board.mk b/firmware/config/boards/microrusefi/board.mk
index 691743494b..dab7ac4d37 100644
--- a/firmware/config/boards/microrusefi/board.mk
+++ b/firmware/config/boards/microrusefi/board.mk
@@ -26,5 +26,10 @@ ifeq ($(DEFAULT_ENGINE_TYPE),)
   DEFAULT_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=MICRO_RUS_EFI
 endif
 
+ifeq ($(EFI_FATAL_ERROR_PIN),)
+  EFI_FATAL_ERROR_PIN = -DEFI_FATAL_ERROR_PIN=GPIOE_3
+endif
+
+
 # Add them all together
-DDEFS += $(MCU_DEFS) -DEFI_USE_OSC=TRUE -DEFI_FATAL_ERROR_PIN=GPIOE_3 -DFIRMWARE_ID=\"microRusEfi\" $(DEFAULT_ENGINE_TYPE)
+DDEFS += $(MCU_DEFS) -DEFI_USE_OSC=TRUE -DFIRMWARE_ID=\"microRusEfi\" $(DEFAULT_ENGINE_TYPE)