diff --git a/firmware/bootloader/!compile_bootloader.bat b/firmware/bootloader/!compile_bootloader.bat
index 42c5dbe5fa..3dc902ead3 100644
--- a/firmware/bootloader/!compile_bootloader.bat
+++ b/firmware/bootloader/!compile_bootloader.bat
@@ -1,18 +1,21 @@
 @echo off
 
+set script_name=!compile_bootloader.bat
+echo Entering %script_name%
+
 rem Needed for board overrides
 IF "%BOOTLOADER_CODE_DESTINATION_PATH%"=="" (SET BOOTLOADER_CODE_DESTINATION_PATH="..")
 
 set BOOTLOADER_CODE_DESTINATION_FILE=%BOOTLOADER_CODE_DESTINATION_PATH%/bootloader_generated.hxx
 rm -f %BOOTLOADER_CODE_DESTINATION_FILE% 
 
-echo Starting bootloader compilation...
+echo %script_name%: Starting bootloader compilation...
 make -j4 -f src/Makefile %1 %2 %3
 
 if errorlevel 1 echo make compilation failed
 if errorlevel 1 exit -1
  
-echo Bootloader build success.
+echo %script_name%: Bootloader build success.
 
 cd blbuild
 rem Generate a header file with binary bootloader code
@@ -21,3 +24,6 @@ cd ..
 
 rem Touch 'bootloader_storage.c' to update its modification date (needed for make)
 copy /b bootloader_storage.c +,,
+
+pwd
+call ../config/boards/clean_env_variables.bat
\ No newline at end of file
diff --git a/firmware/bootloader/!compile_bootloader_405.bat b/firmware/bootloader/!compile_bootloader_405.bat
index cd2697676d..954452daae 100644
--- a/firmware/bootloader/!compile_bootloader_405.bat
+++ b/firmware/bootloader/!compile_bootloader_405.bat
@@ -13,9 +13,3 @@ set BOOTLOADER_CODE_DESTINATION_PATH="../Prometheus/405"
 set DEBUG_LEVEL_OPT="-O2"
 
 call !compile_bootloader.bat -r
-
-rem Clean up so that no one inherits this value
-set PROJECT_BOARD=
-set EXTRA_PARAMS=
-set DEBUG_LEVEL_OPT=
-
diff --git a/firmware/bootloader/!compile_bootloader_469.bat b/firmware/bootloader/!compile_bootloader_469.bat
index 9a22fa312c..2d23879dc4 100644
--- a/firmware/bootloader/!compile_bootloader_469.bat
+++ b/firmware/bootloader/!compile_bootloader_469.bat
@@ -13,8 +13,3 @@ set BOOTLOADER_CODE_DESTINATION_PATH="../Prometheus/469"
 set DEBUG_LEVEL_OPT="-O2"
 
 call !compile_bootloader.bat -r
-
-rem Clean up so that no one inherits this value
-set PROJECT_BOARD=
-set EXTRA_PARAMS=
-set DEBUG_LEVEL_OPT=
diff --git a/firmware/bootloader/!compile_bootloader_discovery407.bat b/firmware/bootloader/!compile_bootloader_discovery407.bat
index 8e5dc529d9..9f26200296 100644
--- a/firmware/bootloader/!compile_bootloader_discovery407.bat
+++ b/firmware/bootloader/!compile_bootloader_discovery407.bat
@@ -15,8 +15,3 @@ set BOOTLOADER_COMMENT="/*F4discovery*/"
 rem set DEBUG_LEVEL_OPT="-O2"
 
 call !compile_bootloader.bat -r
-
-rem Clean up so that no one inherits this value
-set PROJECT_BOARD=
-set EXTRA_PARAMS=
-set DEBUG_LEVEL_OPT=